From: Jean-Marc Lasgouttes Date: Tue, 4 Mar 2008 15:16:54 +0000 (+0000) Subject: revert more minizip changes X-Git-Tag: 1.6.10~5886 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=59c298b75049c8518d673259c40841effaa0c32f;p=lyx.git revert more minizip changes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23456 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/support/minizip/crypt.h b/src/support/minizip/crypt.h index bfb43d9e7b..91e13f2eda 100644 --- a/src/support/minizip/crypt.h +++ b/src/support/minizip/crypt.h @@ -32,7 +32,7 @@ /*********************************************************************** * Return the next byte in the pseudo-random sequence */ -static int decrypt_byte(unsigned long* pkeys, const unsigned long* /* pcrc_32_tab */) +static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) { unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an * unpredictable manner on 16-bit systems; not a problem diff --git a/src/support/minizip/zip.c b/src/support/minizip/zip.c index 434af10b99..57fefb7b49 100644 --- a/src/support/minizip/zip.c +++ b/src/support/minizip/zip.c @@ -187,13 +187,12 @@ local void init_linkedlist(linkedlist_data* ll) ll->first_block = ll->last_block = NULL; } -#if 0 local void free_linkedlist(linkedlist_data* ll) { free_datablock(ll->first_block); ll->first_block = ll->last_block = NULL; } -#endif + local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len) { @@ -304,7 +303,7 @@ local void ziplocal_putValue_inmemory (void* dest, uLong x, int nbByte) /****************************************************************************/ -local uLong ziplocal_TmzDateToDosDate(const tm_zip* ptm, uLong /* dosDate */) +local uLong ziplocal_TmzDateToDosDate(const tm_zip* ptm, uLong dosDate) { uLong year = (uLong)ptm->tm_year; if (year>1980)