From 099b630b50236ddf1f7733127dcd1acd73ed82dc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 28 Oct 2008 09:42:30 +0000 Subject: [PATCH] 2008-10-28 10:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/copyfile.c ! Fixed hb_fsCopy() name collision with static function. --- harbour/ChangeLog | 4 ++++ harbour/source/rtl/copyfile.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b40db49483..56e9ba1b81 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-28 10:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/copyfile.c + ! Fixed hb_fsCopy() name collision with static function. + 2008-10-28 10:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbxvm.h * harbour/source/vm/hvm.c diff --git a/harbour/source/rtl/copyfile.c b/harbour/source/rtl/copyfile.c index 454e3ad2f9..da7096c063 100644 --- a/harbour/source/rtl/copyfile.c +++ b/harbour/source/rtl/copyfile.c @@ -61,12 +61,12 @@ #define BUFFER_SIZE 8192 -static BOOL hb_fsCopy( char * szSource, char * szDest ) +static BOOL hb_copyfile( char * szSource, char * szDest ) { BOOL bRetVal = FALSE; HB_FHANDLE fhndSource; - HB_TRACE(HB_TR_DEBUG, ("hb_fsCopy(%s, %s)", szSource, szDest)); + HB_TRACE(HB_TR_DEBUG, ("hb_copyfile(%s, %s)", szSource, szDest)); while( ( fhndSource = hb_spOpen( ( BYTE * ) szSource, FO_READ | FO_SHARED | FO_PRIVATE ) ) == FS_ERROR ) { @@ -137,7 +137,7 @@ HB_FUNC( __COPYFILE ) { if( ISCHAR( 1 ) && ISCHAR( 2 ) ) { - if( ! hb_fsCopy( hb_parc( 1 ), hb_parc( 2 ) ) ) + if( ! hb_copyfile( hb_parc( 1 ), hb_parc( 2 ) ) ) hb_retl( FALSE ); } else