diff --git a/ChangeLog.txt b/ChangeLog.txt index d818dd0105..704d9b42da 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,19 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-03-08 14:00 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/compiler/hbcmplib.c + * src/rtl/filesys.c + * src/rtl/gtcrs/gtcrs.c + * src/rtl/hbproces.c + * src/rtl/memofile.c + * src/vm/runner.c + * contrib/xhb/txtline.c + * pacified warnings + + * contrib/hbmemio/memio.c + ! fixed C&P typo + 2014-03-06 22:35 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbtcpio/tcpio.c ! fixed local static function prototype diff --git a/contrib/hbmemio/memio.c b/contrib/hbmemio/memio.c index 50e87a9485..0f4d6b5f8a 100644 --- a/contrib/hbmemio/memio.c +++ b/contrib/hbmemio/memio.c @@ -704,14 +704,14 @@ HB_MEMFS_EXPORT HB_FOFFSET hb_memfsSeek( HB_FHANDLE hFile, HB_FOFFSET llOffset, } -HB_MEMFS_EXPORT HB_FOFFSET hb_memfsEof( HB_FHANDLE hFile ) +HB_MEMFS_EXPORT HB_BOOL hb_memfsEof( HB_FHANDLE hFile ) { PHB_MEMFS_FILE pFile; PHB_MEMFS_INODE pInode; HB_BOOL fEof; if( ( pFile = memfsHandleToFile( hFile ) ) == NULL ) - return 0; /* invalid handle */ + return HB_FALSE; /* invalid handle */ pInode = pFile->pInode; HB_MEMFSMT_LOCK(); diff --git a/contrib/xhb/txtline.c b/contrib/xhb/txtline.c index 4e0613b4fa..f06fe833c4 100644 --- a/contrib/xhb/txtline.c +++ b/contrib/xhb/txtline.c @@ -291,6 +291,6 @@ HB_FUNC( HB_READLINE ) if( bAlloc_Term1 ) hb_itemRelease( pTerm1 ); - hb_xfree( pTerm ); + hb_xfree( ( void * ) pTerm ); hb_xfree( pnTermSizes ); } diff --git a/src/compiler/hbcmplib.c b/src/compiler/hbcmplib.c index 8ec3c2db94..9f34767fa1 100644 --- a/src/compiler/hbcmplib.c +++ b/src/compiler/hbcmplib.c @@ -210,7 +210,7 @@ HB_FUNC( HB_COMPILE ) hb_compGenArgList( 1, hb_pcount(), &argc, &argv, &pIncItem, &pOpenFunc, &pMsgFunc ); hb_retni( hb_compMainExt( argc, argv, NULL, NULL, NULL, 0, pIncItem, pOpenFunc, pMsgFunc ) ); - hb_xfree( argv ); + hb_xfree( ( void * ) argv ); } HB_FUNC( HB_COMPILEBUF ) @@ -225,7 +225,7 @@ HB_FUNC( HB_COMPILEBUF ) hb_compGenArgList( 1, hb_pcount(), &argc, &argv, &pIncItem, &pOpenFunc, &pMsgFunc ); iResult = hb_compMainExt( argc, argv, &pBuffer, &nLen, NULL, 0, pIncItem, pOpenFunc, pMsgFunc ); - hb_xfree( argv ); + hb_xfree( ( void * ) argv ); if( iResult == EXIT_SUCCESS && pBuffer ) hb_retclen_buffer( ( char * ) pBuffer, nLen ); @@ -247,7 +247,7 @@ HB_FUNC( HB_COMPILEFROMBUF ) { hb_compGenArgList( 2, hb_pcount(), &argc, &argv, &pIncItem, &pOpenFunc, &pMsgFunc ); iResult = hb_compMainExt( argc, argv, &pBuffer, &nLen, szSource, 0, pIncItem, pOpenFunc, pMsgFunc ); - hb_xfree( argv ); + hb_xfree( ( void * ) argv ); if( iResult == EXIT_SUCCESS && pBuffer ) hb_retclen_buffer( ( char * ) pBuffer, nLen ); diff --git a/src/rtl/filesys.c b/src/rtl/filesys.c index a30e2d573d..10a5c38db3 100644 --- a/src/rtl/filesys.c +++ b/src/rtl/filesys.c @@ -719,8 +719,8 @@ HB_FHANDLE hb_fsPOpen( const char * pszFileName, const char * pszMode ) iMaxFD = 1024; for( hNullHandle = 3; hNullHandle < iMaxFD; ++hNullHandle ) hb_fsClose( hNullHandle ); - setuid( getuid() ); - setgid( getgid() ); + ( void ) setuid( getuid() ); + ( void ) setgid( getgid() ); #if defined( __WATCOMC__ ) HB_FAILURE_RETRY( iResult, execv( "/bin/sh", argv ) ); #else diff --git a/src/rtl/gtcrs/gtcrs.c b/src/rtl/gtcrs/gtcrs.c index 332c6a3ee7..31aa35b43c 100644 --- a/src/rtl/gtcrs/gtcrs.c +++ b/src/rtl/gtcrs/gtcrs.c @@ -2279,8 +2279,8 @@ static InOutBase * create_newXterm( void ) if( fd != masterfd ) close( fd ); - setuid( getuid() ); - setgid( getgid() ); + ( void ) setuid( getuid() ); + ( void ) setgid( getgid() ); execlp( "xterm", "xterm", buf, "+sb", "-fg", "white", "-bg", "black", "-fn", "fixed", "-T", "HB-XTERM Window", NULL ); diff --git a/src/rtl/hbproces.c b/src/rtl/hbproces.c index 372bd63524..3eb63b75e6 100644 --- a/src/rtl/hbproces.c +++ b/src/rtl/hbproces.c @@ -319,8 +319,8 @@ static int hb_fsProcessExec( const char * pszFileName, hb_fsClose( i ); } /* reset extended process attributes */ - setuid( getuid() ); - setgid( getgid() ); + ( void ) setuid( getuid() ); + ( void ) setgid( getgid() ); /* execute command */ execvp( argv[ 0 ], argv ); @@ -567,8 +567,8 @@ HB_FHANDLE hb_fsProcessOpen( const char * pszFileName, } /* reset extended process attributes */ - setuid( getuid() ); - setgid( getgid() ); + ( void ) setuid( getuid() ); + ( void ) setgid( getgid() ); /* execute command */ { diff --git a/src/rtl/memofile.c b/src/rtl/memofile.c index f3083bf3ec..1c22895820 100644 --- a/src/rtl/memofile.c +++ b/src/rtl/memofile.c @@ -67,7 +67,7 @@ static void hb_memoread( HB_BOOL bHandleEOF ) if( pFile != NULL ) { - HB_SIZE nSize = hb_fileSize( pFile ); + HB_SIZE nSize = ( HB_SIZE ) hb_fileSize( pFile ); if( nSize != 0 ) { diff --git a/src/vm/runner.c b/src/vm/runner.c index 943087d6fa..9d496214d4 100644 --- a/src/vm/runner.c +++ b/src/vm/runner.c @@ -605,7 +605,7 @@ static PHRB_BODY hb_hrbLoadFromFile( const char * szHrb, HB_USHORT usMode ) if( pFile != NULL ) { - HB_SIZE nBodySize = hb_fileSize( pFile ); + HB_SIZE nBodySize = ( HB_SIZE ) hb_fileSize( pFile ); if( nBodySize ) {