From 624698cd5a7616c5b2bed25eb30333895f92fe33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Tue, 4 Mar 2014 04:03:14 +0100 Subject: [PATCH] 2014-03-04 04:03 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/vm/set.c * src/vm/memvars.c * src/rtl/copyfile.c ! casting and pacified warnings --- ChangeLog.txt | 6 ++++++ src/rtl/copyfile.c | 4 ++-- src/vm/memvars.c | 2 +- src/vm/set.c | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index d6c751bac7..05840aee84 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,12 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-03-04 04:03 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/vm/set.c + * src/vm/memvars.c + * src/rtl/copyfile.c + ! casting and pacified warnings + 2014-03-04 01:56 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * include/hbchksum.h * src/rtl/hbmd5.c diff --git a/src/rtl/copyfile.c b/src/rtl/copyfile.c index 8a713fbc1d..3fe30c4ec5 100644 --- a/src/rtl/copyfile.c +++ b/src/rtl/copyfile.c @@ -106,10 +106,10 @@ static HB_BOOL hb_copyfile( const char * pszSource, const char * pszDest ) if( pDest != NULL ) { - void * buffer; + HB_UCHAR * buffer; HB_SIZE nRead; - buffer = hb_xgrab( BUFFER_SIZE ); + buffer = ( HB_UCHAR * ) hb_xgrab( BUFFER_SIZE ); bRetVal = HB_TRUE; while( ( nRead = hb_fileRead( pSource, buffer, BUFFER_SIZE, -1 ) ) != 0 ) diff --git a/src/vm/memvars.c b/src/vm/memvars.c index 6a085febcb..7e07e54739 100644 --- a/src/vm/memvars.c +++ b/src/vm/memvars.c @@ -1588,7 +1588,7 @@ HB_FUNC( __MVRESTORE ) uiWidth += uiDec * 256; pbyString = ( HB_BYTE * ) hb_xgrab( uiWidth ); - if( hb_fileRead( fhnd, pbyString, uiWidth, -1 ) == uiWidth ) + if( hb_fileRead( fhnd, pbyString, uiWidth, -1 ) == ( HB_SIZE ) uiWidth ) pItem = hb_itemPutCLPtr( pItem, ( char * ) pbyString, uiWidth - 1 ); else { diff --git a/src/vm/set.c b/src/vm/set.c index 792a4aa202..c6381030e9 100644 --- a/src/vm/set.c +++ b/src/vm/set.c @@ -320,7 +320,6 @@ static void open_handle( PHB_SET_STRUCT pSet, const char * file_name, /* QUESTION: What sharing mode does Clipper use ? [vszakats] */ - handle = NULL; do { if( bPipe )