diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3c021f1f4e..f322e6ffc5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-22 13:19 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbcurl/hbcurl.c + + Code cleanup for 64bit. Only calls to Harbour APIs are + generating warnings now. (hb_xgrab, hb_xrealloc, + hb_fsWriteLarge, hb_fsReadLarge, hb_retclen, hb_storlen) + 2008-06-22 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbw32ddr/w32_ddrw.cpp * contrib/hbodbc/odbc.c diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c index 47bbcac45d..8e250ab264 100644 --- a/harbour/contrib/hbcurl/hbcurl.c +++ b/harbour/contrib/hbcurl/hbcurl.c @@ -126,7 +126,7 @@ typedef struct _HB_CURL void * hb_curl_xgrab( size_t size ) { - return hb_xgrab( ( ULONG ) size ); + return hb_xgrab( size ); } void hb_curl_xfree( void * p ) @@ -136,7 +136,7 @@ void hb_curl_xfree( void * p ) void * hb_curl_xrealloc( void * p, size_t size ) { - return hb_xrealloc( p, ( ULONG ) size ); + return hb_xrealloc( p, size ); } char * hb_curl_strdup( const char * s ) @@ -146,10 +146,10 @@ char * hb_curl_strdup( const char * s ) void * hb_curl_calloc( size_t nelem, size_t elsize ) { - ULONG ulSize = ( ULONG ) ( nelem * elsize ); - void * ptr = hb_xgrab( ulSize ); + size_t size = nelem * elsize; + void * ptr = hb_xgrab( size ); - memset( ptr, '\0', ulSize ); + memset( ptr, '\0', size ); return ptr; } @@ -218,8 +218,8 @@ size_t hb_curl_read_buff_callback( void * buffer, size_t size, size_t nmemb, voi if( hb_curl ) { - ULONG nTodo = ( ULONG ) ( size * nmemb ); - ULONG nLeft = hb_curl->ul_len - hb_curl->ul_pos; + size_t nTodo = size * nmemb; + size_t nLeft = hb_curl->ul_len - hb_curl->ul_pos; if( nTodo > nLeft ) nTodo = nLeft; @@ -228,7 +228,7 @@ size_t hb_curl_read_buff_callback( void * buffer, size_t size, size_t nmemb, voi hb_curl->ul_pos += nTodo; - return ( size_t ) nTodo; + return nTodo; } return -1; @@ -263,8 +263,8 @@ size_t hb_curl_write_buff_callback( void * buffer, size_t size, size_t nmemb, vo if( hb_curl ) { - ULONG nTodo = ( ULONG ) ( size * nmemb ); - ULONG nLeft = hb_curl->dl_len - hb_curl->dl_pos; + size_t nTodo = size * nmemb; + size_t nLeft = hb_curl->dl_len - hb_curl->dl_pos; if( nTodo > nLeft ) { @@ -276,7 +276,7 @@ size_t hb_curl_write_buff_callback( void * buffer, size_t size, size_t nmemb, vo hb_curl->dl_pos += nTodo; - return ( size_t ) nTodo; + return nTodo; } return -1;