From 781415a0dacee4af00579e9aec6a0bf503f3db65 Mon Sep 17 00:00:00 2001 From: carl Date: Sat, 7 Dec 2002 14:34:30 +0000 Subject: [PATCH] - avoid warnings (add typecast) --- rtl/inc/astrings.inc | 7 +++++-- rtl/inc/file.inc | 13 ++++++++----- rtl/inc/objects.pp | 7 +++++-- rtl/inc/system.inc | 9 ++++++--- rtl/inc/wstrings.inc | 7 +++++-- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/rtl/inc/astrings.inc b/rtl/inc/astrings.inc index 032b5f8a94..a398674716 100644 --- a/rtl/inc/astrings.inc +++ b/rtl/inc/astrings.inc @@ -235,7 +235,7 @@ begin If Size>high_of_res then Size:=high_of_res; Move (S2[1],fpc_AnsiStr_To_ShortStr[1],Size); - byte(fpc_AnsiStr_To_ShortStr[0]):=Size; + byte(fpc_AnsiStr_To_ShortStr[0]):=byte(Size); end; end; @@ -841,7 +841,10 @@ end; { $Log$ - Revision 1.33 2002-10-21 19:52:47 jonas + Revision 1.34 2002-12-07 14:34:30 carl + - avoid warnings (add typecast) + + Revision 1.33 2002/10/21 19:52:47 jonas * fixed some buffer overflow errors in SetString (both short and ansistring versions) (merged) diff --git a/rtl/inc/file.inc b/rtl/inc/file.inc index be3532cff5..2a06846693 100644 --- a/rtl/inc/file.inc +++ b/rtl/inc/file.inc @@ -150,7 +150,7 @@ var l : longint; Begin BlockWrite(f,Buf,Count,l); - Result:=l; + Result:=word(l); End; @@ -174,7 +174,7 @@ var l : longint; Begin BlockWrite(f,Buf,Count,l); - Result:=l; + Result:=integer(l); End; @@ -220,7 +220,7 @@ var l : longint; Begin BlockRead(f,Buf,Count,l); - Result:=l; + Result:=word(l); End; @@ -246,7 +246,7 @@ var l : longint; Begin BlockRead(f,Buf,Count,l); - Result:=l; + Result:=integer(l); End; @@ -412,7 +412,10 @@ End; { $Log$ - Revision 1.5 2002-09-07 15:07:45 peter + Revision 1.6 2002-12-07 14:36:14 carl + - avoid warnings (add typecast) + + Revision 1.5 2002/09/07 15:07:45 peter * old logs removed and tabs fixed } diff --git a/rtl/inc/objects.pp b/rtl/inc/objects.pp index a9d40105b9..fe4ea37d7c 100644 --- a/rtl/inc/objects.pp +++ b/rtl/inc/objects.pp @@ -1119,7 +1119,7 @@ BEGIN End Else ObjType := Q^.ObjType; { Update object type } End; If TPCompatible Then Begin - ObjTypeWord := ObjType; + ObjTypeWord := word(ObjType); Write(ObjTypeWord, SizeOf(ObjTypeWord)) end else @@ -2901,7 +2901,10 @@ END; END. { $Log$ - Revision 1.16 2002-10-31 13:08:04 carl + Revision 1.17 2002-12-07 14:37:15 carl + - avoid warnings (add typecast) + + Revision 1.16 2002/10/31 13:08:04 carl * forgot to init P buffer variable = crash Revision 1.15 2002/10/31 12:47:30 carl diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc index 42dbc98ee4..7c45036ea4 100644 --- a/rtl/inc/system.inc +++ b/rtl/inc/system.inc @@ -587,8 +587,8 @@ Procedure HandleErrorAddrFrame (Errno : longint;addr,frame : longint);[public,al begin If pointer(ErrorProc)<>Nil then ErrorProc(Errno,pointer(addr),pointer(frame)); - errorcode:=Errno; - exitcode:=Errno; + errorcode:=word(Errno); + exitcode:=word(Errno); erroraddr:=pointer(addr); errorbase:=frame; halt(errorcode); @@ -757,7 +757,10 @@ end; { $Log$ - Revision 1.37 2002-11-18 18:33:51 peter + Revision 1.38 2002-12-07 14:36:33 carl + - avoid warnings (add typecast) + + Revision 1.37 2002/11/18 18:33:51 peter * Swap(QWord) constant support Revision 1.36 2002/10/14 19:39:17 peter diff --git a/rtl/inc/wstrings.inc b/rtl/inc/wstrings.inc index a8861197f1..07585675a6 100644 --- a/rtl/inc/wstrings.inc +++ b/rtl/inc/wstrings.inc @@ -223,7 +223,7 @@ begin If Size>high_of_res then Size:=high_of_res; Wide2AnsiMoveProc(PWideChar(S2),PChar(@fpc_WideStr_To_ShortStr[1]),Size); - byte(fpc_WideStr_To_ShortStr[0]):=Size; + byte(fpc_WideStr_To_ShortStr[0]):=byte(Size); end; end; @@ -913,7 +913,10 @@ end; { $Log$ - Revision 1.24 2002-10-10 16:08:50 florian + Revision 1.25 2002-12-07 14:35:34 carl + - avoid warnings (add typecast) + + Revision 1.24 2002/10/10 16:08:50 florian + several widestring/pwidechar related helpers added Revision 1.23 2002/10/02 18:21:52 peter