paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-03 21:50:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Fix for bug report 2097 in formatbuf

Browse Source
This commit is contained in:
michael 2002-08-29 10:04:48 +00:00
parent 3be9624a26
commit 2612c7418b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtl/objpas/sysstr.inc
View File

@ -947,11 +947,7 @@ begin
if fmtlen > 0 then if fmtlen > 0 then
Move(fmt,F[1],fmtlen); Move(fmt,F[1],fmtlen);
S:=Format (F,Args); S:=Format (F,Args);
<<<<<<< sysstr.inc
If Cardinal(Length(S))>Buflen then If Cardinal(Length(S))>Buflen then
=======
If cardinal(Length(S))>Buflen then
>>>>>>> 1.1.2.9
Result:=Length(S) Result:=Length(S)
else else
Result:=Buflen; Result:=Buflen;
@ -1342,7 +1338,10 @@ const
{ {
$Log$ $Log$
Revision 1.16 2002-08-29 10:04:25 michael Revision 1.17 2002-08-29 10:04:48 michael
+ Fix for bug report 2097 in formatbuf
Revision 1.16 2002/08/29 10:04:25 michael
+ Fix for bug report 2097 in formatbuf + Fix for bug report 2097 in formatbuf
Revision 1.15 2002/07/06 12:14:03 daniel Revision 1.15 2002/07/06 12:14:03 daniel