mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-10-23 18:51:35 +02:00
* pchar support for %s
This commit is contained in:
parent
a7741dd7e7
commit
ad65fe3aec
@ -606,6 +606,7 @@ begin
|
|||||||
begin
|
begin
|
||||||
if err then
|
if err then
|
||||||
DoFormatError(feInvalidArgindex);
|
DoFormatError(feInvalidArgindex);
|
||||||
|
dec(ArgPos);
|
||||||
exit;
|
exit;
|
||||||
end;
|
end;
|
||||||
result:=true;
|
result:=true;
|
||||||
@ -658,11 +659,11 @@ begin
|
|||||||
if CheckArg(vtString,false) then
|
if CheckArg(vtString,false) then
|
||||||
hs:=Args[doarg].VString^
|
hs:=Args[doarg].VString^
|
||||||
else
|
else
|
||||||
begin
|
if CheckArg(vtPChar,false) then
|
||||||
dec(argpos);
|
hs:=Args[doarg].VPChar
|
||||||
if CheckArg(vtAnsiString,true) then
|
else
|
||||||
hs:=ansistring(Args[doarg].VAnsiString);
|
if CheckArg(vtAnsiString,true) then
|
||||||
end;
|
hs:=ansistring(Args[doarg].VAnsiString);
|
||||||
Index:=Length(hs);
|
Index:=Length(hs);
|
||||||
If (Prec<>-1) and (Index>Prec) then
|
If (Prec<>-1) and (Index>Prec) then
|
||||||
Index:=Prec;
|
Index:=Prec;
|
||||||
@ -969,7 +970,10 @@ const
|
|||||||
|
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.15 1999-04-04 10:19:07 peter
|
Revision 1.16 1999-04-08 10:19:41 peter
|
||||||
|
* pchar support for %s
|
||||||
|
|
||||||
|
Revision 1.15 1999/04/04 10:19:07 peter
|
||||||
* format support for ansistring (from mailinglist)
|
* format support for ansistring (from mailinglist)
|
||||||
* fixed length checking in Trim()
|
* fixed length checking in Trim()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user