Skip to content

Commit d83c9ad

Browse files
jxy-sjxy-s
committed
PhInitFormat parameter cleanup
1 parent 38b39f8 commit d83c9ad

File tree

1 file changed

+99
-99
lines changed

1 file changed

+99
-99
lines changed

‎phlib/include/phbasesup.h

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -4036,247 +4036,247 @@ typedef struct _PH_FORMAT
40364036
FORCEINLINE
40374037
VOID
40384038
PhInitFormatC(
4039-
_Out_ PPH_FORMAT f,
4040-
_In_ WCHAR v
4039+
_Out_ PPH_FORMAT Format,
4040+
_In_ WCHAR Char
40414041
)
40424042
{
4043-
f->Type = CharFormatType;
4044-
f->u.Char = v;
4043+
Format->Type = CharFormatType;
4044+
Format->u.Char = Char;
40454045
}
40464046

40474047
FORCEINLINE
40484048
VOID
40494049
PhInitFormatS(
4050-
_Out_ PPH_FORMAT f,
4051-
_In_ PWSTR v
4050+
_Out_ PPH_FORMAT Format,
4051+
_In_ PWSTR String
40524052
)
40534053
{
4054-
f->Type = StringFormatType;
4055-
PhInitializeStringRef(&f->u.String, v);
4054+
Format->Type = StringFormatType;
4055+
PhInitializeStringRef(&Format->u.String, String);
40564056
}
40574057

40584058
FORCEINLINE
40594059
VOID
40604060
PhInitFormatSR(
4061-
_Out_ PPH_FORMAT f,
4062-
_In_ PH_STRINGREF v
4061+
_Out_ PPH_FORMAT Format,
4062+
_In_ PH_STRINGREF String
40634063
)
40644064
{
4065-
f->Type = StringFormatType;
4066-
f->u.String = v;
4065+
Format->Type = StringFormatType;
4066+
Format->u.String = String;
40674067
}
40684068

40694069
FORCEINLINE
40704070
VOID
40714071
PhInitFormatUCS(
4072-
_Out_ PPH_FORMAT f,
4073-
_In_ PUNICODE_STRING v
4072+
_Out_ PPH_FORMAT Format,
4073+
_In_ PUNICODE_STRING String
40744074
)
40754075
{
4076-
f->Type = StringFormatType;
4077-
PhUnicodeStringToStringRef(v, &f->u.String);
4076+
Format->Type = StringFormatType;
4077+
PhUnicodeStringToStringRef(String, &Format->u.String);
40784078
}
40794079

40804080
FORCEINLINE
40814081
VOID
40824082
PhInitFormatMultiByteS(
4083-
_Out_ PPH_FORMAT f,
4084-
_In_ PSTR v
4083+
_Out_ PPH_FORMAT Format,
4084+
_In_ PSTR String
40854085
)
40864086
{
4087-
f->Type = MultiByteStringFormatType;
4088-
PhInitializeBytesRef(&f->u.MultiByteString, v);
4087+
Format->Type = MultiByteStringFormatType;
4088+
PhInitializeBytesRef(&Format->u.MultiByteString, String);
40894089
}
40904090

40914091
FORCEINLINE
40924092
VOID
40934093
PhInitFormatD(
4094-
_Out_ PPH_FORMAT f,
4095-
_In_ LONG v
4094+
_Out_ PPH_FORMAT Format,
4095+
_In_ LONG Int32
40964096
)
40974097
{
4098-
f->Type = Int32FormatType;
4099-
f->u.Int32 = v;
4098+
Format->Type = Int32FormatType;
4099+
Format->u.Int32 = Int32;
41004100
}
41014101

41024102
FORCEINLINE
41034103
VOID
41044104
PhInitFormatU(
4105-
_Out_ PPH_FORMAT f,
4106-
_In_ ULONG v
4105+
_Out_ PPH_FORMAT Format,
4106+
_In_ ULONG UInt32
41074107
)
41084108
{
4109-
f->Type = UInt32FormatType;
4110-
f->u.UInt32 = v;
4109+
Format->Type = UInt32FormatType;
4110+
Format->u.UInt32 = UInt32;
41114111
}
41124112

41134113
FORCEINLINE
41144114
VOID
41154115
PhInitFormatX(
4116-
_Out_ PPH_FORMAT f,
4117-
_In_ ULONG v
4116+
_Out_ PPH_FORMAT Format,
4117+
_In_ ULONG UInt32
41184118
)
41194119
{
4120-
f->Type = (PH_FORMAT_TYPE)(UInt32FormatType | FormatUseRadix);
4121-
f->u.UInt32 = v;
4122-
f->Radix = 16;
4120+
Format->Type = (PH_FORMAT_TYPE)(UInt32FormatType | FormatUseRadix);
4121+
Format->u.UInt32 = UInt32;
4122+
Format->Radix = 16;
41234123
}
41244124

41254125
FORCEINLINE
41264126
VOID
41274127
PhInitFormatI64D(
4128-
_Out_ PPH_FORMAT f,
4129-
_In_ LONG64 v
4128+
_Out_ PPH_FORMAT Format,
4129+
_In_ LONG64 Int64
41304130
)
41314131
{
4132-
f->Type = Int64FormatType;
4133-
f->u.Int64 = v;
4132+
Format->Type = Int64FormatType;
4133+
Format->u.Int64 = Int64;
41344134
}
41354135

41364136
FORCEINLINE
41374137
VOID
41384138
PhInitFormatI64U(
4139-
_Out_ PPH_FORMAT f,
4140-
_In_ ULONG64 v
4139+
_Out_ PPH_FORMAT Format,
4140+
_In_ ULONG64 UInt64
41414141
)
41424142
{
4143-
f->Type = UInt64FormatType;
4144-
f->u.UInt64 = v;
4143+
Format->Type = UInt64FormatType;
4144+
Format->u.UInt64 = UInt64;
41454145
}
41464146

41474147
FORCEINLINE
41484148
VOID
41494149
PhInitFormatI64UGroupDigits(
4150-
_Out_ PPH_FORMAT f,
4151-
_In_ ULONG64 v
4150+
_Out_ PPH_FORMAT Format,
4151+
_In_ ULONG64 UInt64
41524152
)
41534153
{
4154-
f->Type = (PH_FORMAT_TYPE)(UInt64FormatType | FormatGroupDigits);
4155-
f->u.UInt64 = v;
4154+
Format->Type = (PH_FORMAT_TYPE)(UInt64FormatType | FormatGroupDigits);
4155+
Format->u.UInt64 = UInt64;
41564156
}
41574157

41584158
FORCEINLINE
41594159
VOID
41604160
PhInitFormatI64UWithWidth(
4161-
_Out_ PPH_FORMAT f,
4162-
_In_ ULONG64 v,
4163-
_In_ USHORT w
4161+
_Out_ PPH_FORMAT Format,
4162+
_In_ ULONG64 UInt64,
4163+
_In_ USHORT Width
41644164
)
41654165
{
4166-
f->Type = (PH_FORMAT_TYPE)(UInt64FormatType | FormatPadZeros);
4167-
f->u.UInt64 = v;
4168-
f->Width = w;
4166+
Format->Type = (PH_FORMAT_TYPE)(UInt64FormatType | FormatPadZeros);
4167+
Format->u.UInt64 = UInt64;
4168+
Format->Width = Width;
41694169
}
41704170

41714171
FORCEINLINE
41724172
VOID
41734173
PhInitFormatI64X(
4174-
_Out_ PPH_FORMAT f,
4175-
_In_ ULONG64 v
4174+
_Out_ PPH_FORMAT Format,
4175+
_In_ ULONG64 UInt64
41764176
)
41774177
{
4178-
f->Type = (PH_FORMAT_TYPE)(UInt64FormatType | FormatUseRadix);
4179-
f->u.UInt64 = v;
4180-
f->Radix = 16;
4178+
Format->Type = (PH_FORMAT_TYPE)(UInt64FormatType | FormatUseRadix);
4179+
Format->u.UInt64 = UInt64;
4180+
Format->Radix = 16;
41814181
}
41824182

41834183
FORCEINLINE
41844184
VOID
41854185
PhInitFormatIU(
4186-
_Out_ PPH_FORMAT f,
4187-
_In_ ULONG_PTR v
4186+
_Out_ PPH_FORMAT Format,
4187+
_In_ ULONG_PTR UIntPtr
41884188
)
41894189
{
4190-
f->Type = UIntPtrFormatType;
4191-
f->u.UIntPtr = v;
4190+
Format->Type = UIntPtrFormatType;
4191+
Format->u.UIntPtr = UIntPtr;
41924192
}
41934193

41944194
FORCEINLINE
41954195
VOID
41964196
PhInitFormatIX(
4197-
_Out_ PPH_FORMAT f,
4198-
_In_ ULONG_PTR v
4197+
_Out_ PPH_FORMAT Format,
4198+
_In_ ULONG_PTR UIntPtr
41994199
)
42004200
{
4201-
f->Type = (PH_FORMAT_TYPE)(UIntPtrFormatType | FormatUseRadix);
4202-
f->u.UIntPtr = v;
4203-
f->Radix = 16;
4201+
Format->Type = (PH_FORMAT_TYPE)(UIntPtrFormatType | FormatUseRadix);
4202+
Format->u.UIntPtr = UIntPtr;
4203+
Format->Radix = 16;
42044204
}
42054205

42064206
FORCEINLINE
42074207
VOID
42084208
PhInitFormatIXPadZeros(
4209-
_Out_ PPH_FORMAT f,
4210-
_In_ ULONG_PTR v
4209+
_Out_ PPH_FORMAT Format,
4210+
_In_ ULONG_PTR UIntPtr
42114211
)
42124212
{
4213-
f->Type = (PH_FORMAT_TYPE)(UIntPtrFormatType | FormatUseRadix | FormatPadZeros);
4214-
f->u.UIntPtr = v;
4215-
f->Radix = 16;
4216-
f->Width = sizeof(ULONG_PTR) * 2;
4213+
Format->Type = (PH_FORMAT_TYPE)(UIntPtrFormatType | FormatUseRadix | FormatPadZeros);
4214+
Format->u.UIntPtr = UIntPtr;
4215+
Format->Radix = 16;
4216+
Format->Width = sizeof(ULONG_PTR) * 2;
42174217
}
42184218

42194219
FORCEINLINE
42204220
VOID
42214221
PhInitFormatF(
4222-
_Out_ PPH_FORMAT f,
4223-
_In_ DOUBLE v,
4224-
_In_ USHORT p
4222+
_Out_ PPH_FORMAT Format,
4223+
_In_ DOUBLE Double,
4224+
_In_ USHORT Precision
42254225
)
42264226
{
4227-
f->Type = (PH_FORMAT_TYPE)(DoubleFormatType | FormatUsePrecision);
4228-
f->u.Double = v;
4229-
f->Precision = p;
4227+
Format->Type = (PH_FORMAT_TYPE)(DoubleFormatType | FormatUsePrecision);
4228+
Format->u.Double = Double;
4229+
Format->Precision = Precision;
42304230
}
42314231

42324232
FORCEINLINE
42334233
VOID
42344234
PhInitFormatE(
4235-
_Out_ PPH_FORMAT f,
4236-
_In_ DOUBLE v,
4237-
_In_ USHORT p
4235+
_Out_ PPH_FORMAT Format,
4236+
_In_ DOUBLE Double,
4237+
_In_ USHORT Precision
42384238
)
42394239
{
4240-
f->Type = (PH_FORMAT_TYPE)(DoubleFormatType | FormatStandardForm | FormatUsePrecision);
4241-
f->u.Double = v;
4242-
f->Precision = p;
4240+
Format->Type = (PH_FORMAT_TYPE)(DoubleFormatType | FormatStandardForm | FormatUsePrecision);
4241+
Format->u.Double = Double;
4242+
Format->Precision = Precision;
42434243
}
42444244

42454245
FORCEINLINE
42464246
VOID
42474247
PhInitFormatA(
4248-
_Out_ PPH_FORMAT f,
4249-
_In_ DOUBLE v,
4250-
_In_ USHORT p
4248+
_Out_ PPH_FORMAT Format,
4249+
_In_ DOUBLE Double,
4250+
_In_ USHORT Precision
42514251
)
42524252
{
4253-
f->Type = (PH_FORMAT_TYPE)(DoubleFormatType | FormatHexadecimalForm | FormatUsePrecision);
4254-
f->u.Double = v;
4255-
f->Precision = p;
4253+
Format->Type = (PH_FORMAT_TYPE)(DoubleFormatType | FormatHexadecimalForm | FormatUsePrecision);
4254+
Format->u.Double = Double;
4255+
Format->Precision = Precision;
42564256
}
42574257

42584258
FORCEINLINE
42594259
VOID
42604260
PhInitFormatSize(
4261-
_Out_ PPH_FORMAT f,
4262-
_In_ ULONG64 v
4261+
_Out_ PPH_FORMAT Format,
4262+
_In_ ULONG64 Size
42634263
)
42644264
{
4265-
f->Type = SizeFormatType;
4266-
f->u.Size = v;
4265+
Format->Type = SizeFormatType;
4266+
Format->u.Size = Size;
42674267
}
42684268

42694269
FORCEINLINE
42704270
VOID
42714271
PhInitFormatSizeWithPrecision(
4272-
_Out_ PPH_FORMAT f,
4273-
_In_ ULONG64 v,
4274-
_In_ USHORT p
4272+
_Out_ PPH_FORMAT Format,
4273+
_In_ ULONG64 Size,
4274+
_In_ USHORT Precision
42754275
)
42764276
{
4277-
f->Type = (PH_FORMAT_TYPE)(SizeFormatType | FormatUsePrecision);
4278-
f->u.Size = v;
4279-
f->Precision = p;
4277+
Format->Type = (PH_FORMAT_TYPE)(SizeFormatType | FormatUsePrecision);
4278+
Format->u.Size = Size;
4279+
Format->Precision = Precision;
42804280
}
42814281

42824282
PHLIBAPI

0 commit comments

Comments
 (0)