From 5bc2db82c956d418d4a32382ac2d9f1da22cf496 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 3 Sep 2008 13:06:28 +0000 Subject: [PATCH] 2008-09-03 15:05 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbziparch/hbziparc.c * contrib/hbziparch/hbzipnew.cpp ! Some fixes to prev. --- harbour/ChangeLog | 5 +++++ harbour/contrib/hbziparch/hbziparc.c | 2 +- harbour/contrib/hbziparch/hbzipnew.cpp | 13 ++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4391d3f8aa..35de297526 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-03 15:05 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbziparch/hbziparc.c + * contrib/hbziparch/hbzipnew.cpp + ! Some fixes to prev. + 2008-09-03 12:34 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbziparch/hbziparc.c * contrib/hbziparch/hbzipnew.cpp diff --git a/harbour/contrib/hbziparch/hbziparc.c b/harbour/contrib/hbziparch/hbziparc.c index c3be49b16b..33f9bf8625 100644 --- a/harbour/contrib/hbziparch/hbziparc.c +++ b/harbour/contrib/hbziparch/hbziparc.c @@ -739,7 +739,7 @@ static void hb_procexistingzip( BOOL bUnzip ) if( ISCHAR( 1 ) ) { char * pszZipFileName = hb_FNAddZipExt( hb_parc( 1 ) ); - PHB_ITEM pParamFiles = hb_param( 6, HB_IT_STRING | HB_IT_NUMERIC | HB_IT_ARRAY ); + PHB_ITEM pParamFiles = hb_param( bUnzip ? 6 : 2, HB_IT_STRING | HB_IT_NUMERIC | HB_IT_ARRAY ); PHB_ITEM pProcFiles = hb_itemArrayNew( 0 ); if( pParamFiles ) diff --git a/harbour/contrib/hbziparch/hbzipnew.cpp b/harbour/contrib/hbziparch/hbzipnew.cpp index 7eb64ed60b..16465e37b1 100644 --- a/harbour/contrib/hbziparch/hbzipnew.cpp +++ b/harbour/contrib/hbziparch/hbzipnew.cpp @@ -333,18 +333,13 @@ PHB_ITEM hb_GetFileNamesFromZip( char * szFile, BOOL bVerbose ) if( iRatio < 0 ) iRatio = 0; - - hb_arraySetNL( pTempArray, HBZA_FI_LENGTH , fh.m_uUncomprSize ); - hb_arraySetNL( pTempArray, HBZA_FI_SIZE , fh.m_uComprSize ); - hb_arraySetNL( pTempArray, HBZA_FI_RATIO , iRatio ); } else - { iRatio = 0; - hb_arraySetNL( pTempArray, HBZA_FI_LENGTH , fh.m_uUncomprSize ); - hb_arraySetNL( pTempArray, HBZA_FI_SIZE , fh.m_uComprSize ); - hb_arraySetNL( pTempArray, HBZA_FI_RATIO , iRatio ); - } + + hb_arraySetNL( pTempArray, HBZA_FI_LENGTH , fh.m_uUncomprSize ); + hb_arraySetNL( pTempArray, HBZA_FI_SIZE , fh.m_uComprSize ); + hb_arraySetNL( pTempArray, HBZA_FI_RATIO , iRatio ); { DWORD uAttr = fh.GetSystemAttr();