|
@@ -938,7 +938,7 @@ begin
|
|
|
Result:=StrFmt(Buffer,Fmt,Args,DefaultFormatSettings);
|
|
|
end;
|
|
|
|
|
|
-Function StrFmt(Buffer,Fmt : PChar; Const Args: Array of const; Const FormatSettings: TFormatSettings): PChar;
|
|
|
+Function StrFmt(Buffer,Fmt : PChar; Const Args: Array of const; Const FormatSettings: TFormatSettings): PChar;
|
|
|
|
|
|
begin
|
|
|
Buffer[FormatBuf(Buffer^,Maxint,Fmt^,strlen(fmt),args,FormatSettings)]:=#0;
|
|
@@ -1104,7 +1104,7 @@ Var
|
|
|
P: Integer;
|
|
|
Negative, TooSmall, TooLarge: Boolean;
|
|
|
DS: Char;
|
|
|
-
|
|
|
+
|
|
|
Begin
|
|
|
DS:=FormatSettings.DecimalSeparator;
|
|
|
Case format Of
|
|
@@ -1608,7 +1608,7 @@ begin
|
|
|
Result:=FloatToStrF(Value,ffGeneral,-1,0);
|
|
|
end;
|
|
|
|
|
|
-function AnsiDequotedStr(const S: string; AQuote: Char): string;
|
|
|
+function AnsiDequotedStr(const S: string; AQuote: Char): string;
|
|
|
|
|
|
var p : pchar;
|
|
|
|
|
@@ -1666,7 +1666,7 @@ begin
|
|
|
begin
|
|
|
CheckStrs;
|
|
|
if B then
|
|
|
- Result:=TrueBoolStrs[0]
|
|
|
+ Result:=TrueBoolStrs[0]
|
|
|
else
|
|
|
Result:=FalseBoolStrs[0];
|
|
|
end
|
|
@@ -1682,7 +1682,7 @@ begin
|
|
|
if not(TryStrToBool(S,Result)) then
|
|
|
Result:=Default;
|
|
|
end;
|
|
|
-
|
|
|
+
|
|
|
function TryStrToBool(const S: string; out Value: Boolean): Boolean;
|
|
|
Var
|
|
|
Temp : String;
|
|
@@ -1902,7 +1902,7 @@ Var
|
|
|
End; { Case }
|
|
|
End { Begin }
|
|
|
Else
|
|
|
- Inc(Fmt);
|
|
|
+ Inc(Fmt);
|
|
|
End; { Case }
|
|
|
End; { While .. Begin }
|
|
|
End;
|
|
@@ -2205,7 +2205,7 @@ begin
|
|
|
fvComp:
|
|
|
Str(Currency(Value):23, Buffer);
|
|
|
end;
|
|
|
-
|
|
|
+
|
|
|
N := 1;
|
|
|
L := Byte(Buffer[0]);
|
|
|
while Buffer[N]=' ' do
|
|
@@ -2460,8 +2460,8 @@ begin
|
|
|
Result:=mbSingleByte;
|
|
|
end;
|
|
|
|
|
|
-Function StrByteType(Str: PChar; Index: Cardinal): TMbcsByteType;
|
|
|
|
|
|
+Function StrByteType(Str: PChar; Index: Cardinal): TMbcsByteType;
|
|
|
begin
|
|
|
Result:=mbSingleByte;
|
|
|
end;
|
|
@@ -2473,6 +2473,12 @@ begin
|
|
|
end;
|
|
|
|
|
|
|
|
|
+function StrNextChar(const Str: PChar): PChar;
|
|
|
+begin
|
|
|
+ result:=Str+StrCharLength(Str);
|
|
|
+end;
|
|
|
+
|
|
|
+
|
|
|
Function FindCmdLineSwitch(const Switch: string; const Chars: TSysCharSet;IgnoreCase: Boolean): Boolean;
|
|
|
|
|
|
Var
|