From 1d676139ac725e53e130a90aa02d4c3c8dc2feea Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 16 Jun 2000 19:28:03 +0000 Subject: [PATCH] 2000-06-16 21:28 UTC+0100 Victor Szakats --- harbour/ChangeLog | 11 ++++++++++- harbour/source/rtl/transfrm.c | 5 +++-- harbour/source/vm/classes.c | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9e54975510..070f531fc3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,10 +1,18 @@ +2000-06-16 21:28 UTC+0100 Victor Szakats + + * source/rtl/transfrm.c + ! Fixed GCC -O2 warnings. + + * source/vm/classes.c + ! Fixed GCC -O2 warning in __SENDER() + 2000-06-16 10:55 UTC-0800 Ron Pinkas * source/pp/ppcore.c ! Removed 1 // comment. 2000-06-16 18:45 UTC+0100 Victor Szakats - * source/rtl/classes.c + * source/vm/classes.c ! Formatting, warnings fixed. * hb_itemCopy( &hb_stack.return, ... ) -> hb_itemReturn( ... ) @@ -51,6 +59,7 @@ * makefile.bc % Removed some more redundant -I$(INCLUDE_DIR)s + % Removed redundant -I$(LANG_DIR)s * include/hbclass.ch ! Minor cleanups (#includes moved after the self-guards, nil->NIL, diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c index 654e410c5a..85f16f1dd4 100644 --- a/harbour/source/rtl/transfrm.c +++ b/harbour/source/rtl/transfrm.c @@ -80,8 +80,8 @@ HB_FUNC( TRANSFORM ) ULONG ulPicLen = hb_itemGetCLen( pPic ); USHORT uiPicFlags; /* Function flags */ - ULONG ulParamS; - BYTE byParamL; + ULONG ulParamS = 0; /* To avoid GCC -O2 warning */ + BYTE byParamL = '\0'; /* To avoid GCC -O2 warning */ char * szResult; ULONG ulResultPos; @@ -529,6 +529,7 @@ HB_FUNC( TRANSFORM ) else { szResult = NULL; /* To avoid GCC -O2 warning */ + ulResultPos = 0; /* To avoid GCC -O2 warning */ bError = TRUE; } diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c index 1a10e890dc..a9bf92adbb 100644 --- a/harbour/source/vm/classes.c +++ b/harbour/source/vm/classes.c @@ -1718,7 +1718,7 @@ HB_FUNC( __CLSPARENT ) HB_FUNC( __SENDER ) { PHB_ITEM pBase = hb_stack.pBase; - PHB_ITEM oSender; + PHB_ITEM oSender = NULL; USHORT iLevel = 3; while( iLevel > 0 && pBase != hb_stack.pItems ) @@ -1726,11 +1726,11 @@ HB_FUNC( __SENDER ) pBase = hb_stack.pItems + pBase->item.asSymbol.stackbase; oSender = pBase + 1; - if( ( iLevel-- == 2 && ( oSender )->type != HB_IT_BLOCK ) || ( oSender )->type == HB_IT_NIL ) + if( ( iLevel-- == 2 && oSender->type != HB_IT_BLOCK ) || ( oSender )->type == HB_IT_NIL ) break; } - if( iLevel == 0 && ( oSender )->type == HB_IT_OBJECT ) + if( iLevel == 0 && oSender != NULL && oSender->type == HB_IT_OBJECT ) hb_itemReturn( oSender ); }