fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-17 13:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbmzip/hbmzip.ch
   * contrib/hbmzip/hbmzip.c
     + Added error codes to hbmzip.ch
     + Interface code changed to use manifest constants 
       instead of literals in a few places.
       [TOMERGE RC1]
This commit is contained in:
Viktor Szakats
2008-06-17 11:29:34 +00:00
parent abd783e5c5
commit ebc5ce782c
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-17 13:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbmzip/hbmzip.ch
* contrib/hbmzip/hbmzip.c
+ Added error codes to hbmzip.ch
+ Interface code changed to use manifest constants
instead of literals in a few places.
[TOMERGE RC1]
2008-06-17 09:43 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbmisc/spd.c
+ SQL_SPRINTF() enhancements from Javier.

6
harbour/contrib/hbmzip/hbmzip.c
View File

@@ -647,12 +647,12 @@ static int hb_unzipExtractCurrentFile( unzFile hUnzip, char* szFileName, char* s
iResult = unzGetCurrentFileInfo( hUnzip, &ufi, szName, _POSIX_PATH_MAX,
NULL, 0, NULL, 0 );
if( iResult != 0 )
if( iResult != UNZ_OK )
return iResult;
iResult = unzOpenCurrentFilePassword( hUnzip, szPassword );
if( iResult != 0 )
if( iResult != UNZ_OK )
return iResult;
if( szFileName )
@@ -683,7 +683,7 @@ static int hb_unzipExtractCurrentFile( unzFile hUnzip, char* szFileName, char* s
if( ufi.external_fa & 0x40000000 ) /* DIRECTORY */
{
hb_fsMkDir( (BYTE*) szName );
iResult = 0;
iResult = UNZ_OK;
}
else
{

24
harbour/contrib/hbmzip/hbmzip.ch
View File

@@ -53,8 +53,26 @@
#ifndef HB_MZIP_CH_
#define HB_MZIP_CH_
#define HB_ZIP_OPEN_CREATE 0
#define HB_ZIP_OPEN_CREATEAFTER 1
#define HB_ZIP_OPEN_ADDINZIP 2
#define HB_ZIP_OPEN_CREATE 0
#define HB_ZIP_OPEN_CREATEAFTER 1
#define HB_ZIP_OPEN_ADDINZIP 2
#define Z_ERRNO -1
#define UNZ_OK 0
#define UNZ_END_OF_LIST_OF_FILE -100
#define UNZ_ERRNO Z_ERRNO
#define UNZ_EOF 0
#define UNZ_PARAMERROR -102
#define UNZ_BADZIPFILE -103
#define UNZ_INTERNALERROR -104
#define UNZ_CRCERROR -105
#define ZIP_OK 0
#define ZIP_EOF 0
#define ZIP_ERRNO Z_ERRNO
#define ZIP_PARAMERROR -102
#define ZIP_BADZIPFILE -103
#define ZIP_INTERNALERROR -104
#endif