Menu
▾
▴
[opengtoolkit-cvs] lvzip/c_source crypt.h, 1.3, 1.4 deflate.h, 1.4, 1.5 mztools.c, 1.2, 1.3 mztools.h, 1.1, 1.2 unzip.c, 1.8, 1.9 zconf.h, 1.6, 1.7 zip.c, 1.10, 1.11
|
From: Rolf K. <lab...@us...> - 2007-12-06 18:56:14
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30647 Modified Files: crypt.h deflate.h mztools.c mztools.h unzip.c zconf.h zip.c Log Message: Modifications to better support compilation with LabWindows CVI Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** zip.c 17 Sep 2007 12:29:41 -0000 1.10 --- zip.c 6 Dec 2007 18:56:17 -0000 1.11 *************** *** 172,175 **** --- 172,176 ---- } + local void free_datablock OF((linkedlist_datablock_internal* ldi)); local void free_datablock(ldi) linkedlist_datablock_internal* ldi; *************** *** 183,186 **** --- 184,188 ---- } + local void init_linkedlist OF((linkedlist_data* ll)); local void init_linkedlist(ll) linkedlist_data* ll; *************** *** 189,192 **** --- 191,195 ---- } + local void free_linkedlist OF((linkedlist_data* ll)); local void free_linkedlist(ll) linkedlist_data* ll; *************** *** 197,200 **** --- 200,204 ---- + local int add_data_in_datablock OF((linkedlist_data* ll, const void* buf, uLong len)); local int add_data_in_datablock(ll,buf,len) linkedlist_data* ll; *************** *** 315,318 **** --- 319,323 ---- + local uLong ziplocal_TmzDateToDosDate OF((const tm_zip* ptm,uLong dosDate)); local uLong ziplocal_TmzDateToDosDate(ptm,dosDate) const tm_zip* ptm; *************** *** 332,339 **** /****************************************************************************/ ! 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) --- 337,342 ---- /****************************************************************************/ ! 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) *************** *** 944,947 **** --- 947,951 ---- } + local int zipFlushWriteBuffer OF((zip_internal* zi)); local int zipFlushWriteBuffer(zi) zip_internal* zi; *************** *** 1227,1229 **** { return zipClose2(file, global_comment, NULL); ! } \ No newline at end of file --- 1231,1233 ---- { return zipClose2(file, global_comment, NULL); ! } Index: zconf.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zconf.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** zconf.h 7 Jan 2006 20:06:23 -0000 1.6 --- zconf.h 6 Dec 2007 18:56:17 -0000 1.7 *************** *** 73,76 **** --- 73,79 ---- # define WIN32 # endif + # if defined(_DEBUG) || defined(_CVI_DEBUG_) + # define DEBUG 1 + # endif #endif #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** unzip.c 17 Sep 2007 12:29:41 -0000 1.8 --- unzip.c 6 Dec 2007 18:56:17 -0000 1.9 *************** *** 153,156 **** --- 153,190 ---- + 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" *************** *** 162,172 **** 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; --- 196,199 ---- *************** *** 197,205 **** 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; --- 224,227 ---- *************** *** 225,233 **** } - 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; --- 247,250 ---- *************** *** 328,335 **** 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; --- 345,348 ---- *************** *** 564,578 **** 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, --- 577,580 ---- Index: crypt.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/crypt.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** crypt.h 7 Jan 2006 20:06:22 -0000 1.3 --- crypt.h 6 Dec 2007 18:56:17 -0000 1.4 *************** *** 88,91 **** --- 88,94 ---- # endif + static int crypthead OF((const char *passwd, unsigned char *buf, int bufSize, unsigned long* pkeys, + const unsigned long* pcrc_32_tab, unsigned long crcForCrypting)); + static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting) const char *passwd; /* password string */ Index: mztools.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/mztools.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mztools.c 7 Jan 2006 20:06:23 -0000 1.2 --- mztools.c 6 Dec 2007 18:56:17 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- #include "zlib.h" #include "unzip.h" + #include "mztools.h" #define READ_8(adr) ((unsigned char)*(adr)) Index: mztools.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/mztools.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mztools.h 25 Dec 2004 16:29:44 -0000 1.1 --- mztools.h 6 Dec 2007 18:56:17 -0000 1.2 *************** *** 23,31 **** fileOutTmp: temporary file name used for recovery */ ! extern int ZEXPORT unzRepair(const char* file, ! const char* fileOut, ! const char* fileOutTmp, ! uLong* nRecovered, ! uLong* bytesRecovered); #endif --- 23,31 ---- fileOutTmp: temporary file name used for recovery */ ! extern int ZEXPORT unzRepair OF((const char* file, ! const char* fileOut, ! const char* fileOutTmp, ! uLong* nRecovered, ! uLong* bytesRecovered)); #endif Index: deflate.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/deflate.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** deflate.h 7 Jan 2006 20:06:22 -0000 1.4 --- deflate.h 6 Dec 2007 18:56:17 -0000 1.5 *************** *** 297,301 **** #ifndef DEBUG /* Inline versions of _tr_tally for speed: */ - #if defined(GEN_TREES_H) || !defined(STDC) extern uch _length_code[]; --- 297,300 ---- |
