Menu
▾
▴
[opengtoolkit-cvs] lvzip/c_source unzip.c, 1.11, 1.12 zip.c, 1.13, 1.14 zip.h, 1.6, 1.7
|
From: Rolf K. <lab...@us...> - 2008-03-31 20:44:32
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3406 Modified Files: unzip.c zip.c zip.h Log Message: Small cosmetic changes to sync zip sources better with official code from Gilles Volant Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** unzip.c 27 Feb 2008 20:48:55 -0000 1.11 --- unzip.c 31 Mar 2008 20:44:36 -0000 1.12 *************** *** 154,191 **** - local int unzlocal_getByte OF((const zlib_filefunc_def* pzlib_filefunc_def, - voidpf filestream, - int *pi)); - - local int unzlocal_getShort OF((const zlib_filefunc_def* pzlib_filefunc_def, - voidpf filestream, - uLong *pX)); - - local int unzlocal_getLong OF((const zlib_filefunc_def* pzlib_filefunc_def, - voidpf filestream, - uLong *pX)); - - local int strcmpcasenosensitive_internal OF((const char* fileName1, const char* fileName2)); - - local uLong unzlocal_SearchCentralDir OF((const zlib_filefunc_def* pzlib_filefunc_def, - voidpf filestream)); - - local void unzlocal_DosDateToTmuDate OF((uLong ulDosDate, tm_unz* ptm)); - - local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file, - unz_file_info *pfile_info, - unz_file_info_internal - *pfile_info_internal, - char *szFileName, - uLong fileNameBufferSize, - void *extraField, - uLong extraFieldBufferSize, - char *szComment, - uLong commentBufferSize)); - - local int unzlocal_CheckCurrentFileCoherencyHeader OF((unz_s* s, uInt* piSizeVar, - uLong *poffset_local_extrafield, - uInt *psize_local_extrafield)); - #ifndef NOUNCRYPT #include "crypt.h" --- 154,157 ---- *************** *** 197,200 **** --- 163,173 ---- IN assertion: the stream s has been sucessfully opened for reading. */ + + + local int unzlocal_getByte OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + int *pi)); + local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi) const zlib_filefunc_def* pzlib_filefunc_def; *************** *** 225,228 **** --- 198,206 ---- Reads a long in LSB order from the given gz_stream. Sets */ + local int unzlocal_getShort OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX)); + local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) const zlib_filefunc_def* pzlib_filefunc_def; *************** *** 248,251 **** --- 226,234 ---- } + local int unzlocal_getLong OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX)); + local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) const zlib_filefunc_def* pzlib_filefunc_def; *************** *** 281,284 **** --- 264,270 ---- /* My own strcmpi / strcasecmp */ + local int strcmpcasenosensitive_internal OF(( + const char* fileName1, + const char* fileName2)); local int strcmpcasenosensitive_internal (fileName1,fileName2) const char* fileName1; *************** *** 346,349 **** --- 332,339 ---- the global comment) */ + local uLong unzlocal_SearchCentralDir OF(( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream)); + local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) const zlib_filefunc_def* pzlib_filefunc_def; *************** *** 560,563 **** --- 550,556 ---- Translate date/time from Dos format to tm_unz (readable more easilty) */ + local void unzlocal_DosDateToTmuDate OF(( + uLong ulDosDate, + tm_unz* ptm)); local void unzlocal_DosDateToTmuDate (ulDosDate, ptm) uLong ulDosDate; *************** *** 578,581 **** --- 571,585 ---- Get Info about the current file in the zipfile, with internal only info */ + local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file, + unz_file_info *pfile_info, + unz_file_info_internal + *pfile_info_internal, + char *szFileName, + uLong fileNameBufferSize, + void *extraField, + uLong extraFieldBufferSize, + char *szComment, + uLong commentBufferSize)); + local int unzlocal_GetCurrentFileInfoInternal (file, pfile_info, *************** *** 958,961 **** --- 962,971 ---- (filename and size of extra field data) */ + local int unzlocal_CheckCurrentFileCoherencyHeader OF(( + unz_s* s, + uInt* piSizeVar, + uLong *poffset_local_extrafield, + uInt *psize_local_extrafield)); + local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar, poffset_local_extrafield, *************** *** 1255,1259 **** (!(pfile_in_zip_read_info->raw))) pfile_in_zip_read_info->stream.avail_out = ! (uInt)pfile_in_zip_read_info->rest_read_uncompressed; if ((len>pfile_in_zip_read_info->rest_read_compressed+ --- 1265,1269 ---- (!(pfile_in_zip_read_info->raw))) pfile_in_zip_read_info->stream.avail_out = ! (uInt)pfile_in_zip_read_info->rest_read_uncompressed; if ((len>pfile_in_zip_read_info->rest_read_compressed+ Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** zip.c 31 Mar 2008 19:53:40 -0000 1.13 --- zip.c 31 Mar 2008 20:44:36 -0000 1.14 *************** *** 30,33 **** --- 30,34 ---- #endif + #ifndef local # define local static *************** *** 338,343 **** /****************************************************************************/ ! local int ziplocal_getByte OF((const zlib_filefunc_def* pzlib_filefunc_def, ! voidpf filestream, int *pi)); local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi) --- 339,346 ---- /****************************************************************************/ ! local int ziplocal_getByte OF(( ! const zlib_filefunc_def* pzlib_filefunc_def, ! voidpf filestream, ! int *pi)); local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi) *************** *** 722,729 **** int err = ZIP_OK; ! #ifdef NOCRYPT if (password != NULL) return ZIP_PARAMERROR; ! #endif if (file == NULL) --- 725,732 ---- int err = ZIP_OK; ! # ifdef NOCRYPT if (password != NULL) return ZIP_PARAMERROR; ! # endif if (file == NULL) Index: zip.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** zip.h 17 Sep 2007 05:07:16 -0000 1.6 --- zip.h 31 Mar 2008 20:44:36 -0000 1.7 *************** *** 4,13 **** Copyright (C) 1998-2005 Gilles Vollant - This unzip package allow creates .ZIP file, compatible with PKZip 2.04g WinZip, InfoZip tools and compatible. Multi volume ZipFile (span) are not supported. Encryption compatible with pkzip 2.04g only supported - Old compressions used by old PKZip 1.x are not supported --- 4,11 ---- |
