]> git.lyx.org Git - features.git/commitdiff
revert more minizip changes
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Tue, 4 Mar 2008 15:16:54 +0000 (15:16 +0000)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Tue, 4 Mar 2008 15:16:54 +0000 (15:16 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23456 a592a061-630c-0410-9148-cb99ea01b6c8

src/support/minizip/crypt.h
src/support/minizip/zip.c

index bfb43d9e7bd86cf7137ba0bffd12e3f320ff2b26..91e13f2edae01cc3b9e0bdb222a3a4040f4b7aa3 100644 (file)
@@ -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
index 434af10b999309967b14beaa2f8869e56ff565ac..57fefb7b49058c189a1cc5a1859db9384c5a319c 100644 (file)
@@ -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)