From 315689583ca9baa7da1b3c0ba1b1a5d3f32bf59d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 28 Aug 2020 16:12:20 -0700 Subject: [PATCH] zip: Remove usage of OF macros These are only needed to support very old K&R C compilers[1]. gentoo has also renamed these macros in its zlib package[2] which means this code was failing to compile there. [1] https://trac.osgeo.org/gdal/ticket/6220 [2] https://bugs.gentoo.org/383179 --- src/zip/unzip.h | 44 ++++++++++++++++++++++---------------------- src/zip/zip.h | 16 ++++++++-------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/zip/unzip.h b/src/zip/unzip.h index e0a20ab7..dcfbe225 100644 --- a/src/zip/unzip.h +++ b/src/zip/unzip.h @@ -111,9 +111,9 @@ typedef struct unz_file_info_s tm_unz tmu_date; } unz_file_info; -extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, +extern int ZEXPORT unzStringFileNameCompare (const char* fileName1, const char* fileName2, - int iCaseSensitivity)); + int iCaseSensitivity); /* Compare two filename (fileName1,fileName2). If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) @@ -124,7 +124,7 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, */ -extern unzFile ZEXPORT unzOpen OF((const char *path)); +extern unzFile ZEXPORT unzOpen (const char *path); /* Open a Zip file. path contain the full pathname (by example, on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer @@ -135,24 +135,24 @@ extern unzFile ZEXPORT unzOpen OF((const char *path)); of this unzip package. */ -extern int ZEXPORT unzClose OF((unzFile file)); +extern int ZEXPORT unzClose (unzFile file); /* Close a ZipFile opened with unzipOpen. If there is files inside the .Zip opened with unzOpenCurrentFile (see later), these files MUST be closed with unzipCloseCurrentFile before call unzipClose. return UNZ_OK if there is no problem. */ -extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, - unz_global_info *pglobal_info)); +extern int ZEXPORT unzGetGlobalInfo (unzFile file, + unz_global_info *pglobal_info); /* Write info about the ZipFile in the *pglobal_info structure. No preparation of the structure is needed return UNZ_OK if there is no problem. */ -extern int ZEXPORT unzGetGlobalComment OF((unzFile file, +extern int ZEXPORT unzGetGlobalComment (unzFile file, char *szComment, - uLong uSizeBuf)); + uLong uSizeBuf); /* Get the global comment string of the ZipFile, in the szComment buffer. uSizeBuf is the size of the szComment buffer. @@ -163,22 +163,22 @@ extern int ZEXPORT unzGetGlobalComment OF((unzFile file, /***************************************************************************/ /* Unzip package allow you browse the directory of the zipfile */ -extern int ZEXPORT unzGoToFirstFile OF((unzFile file)); +extern int ZEXPORT unzGoToFirstFile (unzFile file); /* Set the current file of the zipfile to the first file. return UNZ_OK if there is no problem */ -extern int ZEXPORT unzGoToNextFile OF((unzFile file)); +extern int ZEXPORT unzGoToNextFile (unzFile file); /* Set the current file of the zipfile to the next file. return UNZ_OK if there is no problem return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. */ -extern int ZEXPORT unzLocateFile OF((unzFile file, +extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, - int iCaseSensitivity)); + int iCaseSensitivity); /* Try locate the file szFileName in the zipfile. For the iCaseSensitivity signification, see unzStringFileNameCompare @@ -189,14 +189,14 @@ extern int ZEXPORT unzLocateFile OF((unzFile file, */ -extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, +extern int ZEXPORT unzGetCurrentFileInfo (unzFile file, unz_file_info *pfile_info, char *szFileName, uLong fileNameBufferSize, void *extraField, uLong extraFieldBufferSize, char *szComment, - uLong commentBufferSize)); + uLong commentBufferSize); /* Get Info about the current file if pfile_info!=NULL, the *pfile_info structure will contain somes info about @@ -215,22 +215,22 @@ extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, from it, and close it (you can close it before reading all the file) */ -extern int ZEXPORT unzOpenCurrentFile OF((unzFile file)); +extern int ZEXPORT unzOpenCurrentFile (unzFile file); /* Open for reading data the current file in the zipfile. If there is no error, the return value is UNZ_OK. */ -extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); +extern int ZEXPORT unzCloseCurrentFile (unzFile file); /* Close the file in zip opened with unzOpenCurrentFile Return UNZ_CRCERROR if all the file was read but the CRC is not good */ -extern int ZEXPORT unzReadCurrentFile OF((unzFile file, +extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, - unsigned len)); + unsigned len); /* Read bytes from the current file (opened by unzOpenCurrentFile) buf contain buffer where data must be copied @@ -242,19 +242,19 @@ extern int ZEXPORT unzReadCurrentFile OF((unzFile file, (UNZ_ERRNO for IO error, or zLib error for uncompress error) */ -extern z_off_t ZEXPORT unztell OF((unzFile file)); +extern z_off_t ZEXPORT unztell (unzFile file); /* Give the current position in uncompressed data */ -extern int ZEXPORT unzeof OF((unzFile file)); +extern int ZEXPORT unzeof (unzFile file); /* return 1 if the end of file was reached, 0 elsewhere */ -extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, +extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, - unsigned len)); + unsigned len); /* Read extra field from the current file (opened by unzOpenCurrentFile) This is the local-header version of the extra field (sometimes, there is diff --git a/src/zip/zip.h b/src/zip/zip.h index 4182d2bf..bef22de8 100644 --- a/src/zip/zip.h +++ b/src/zip/zip.h @@ -93,7 +93,7 @@ typedef struct uLong external_fa; /* external file attributes 4 bytes */ } zip_fileinfo; -extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append)); +extern zipFile ZEXPORT zipOpen (const char *pathname, int append); /* Create a zipfile. pathname contain on Windows NT a filename like "c:\\zlib\\zlib111.zip" or on @@ -107,7 +107,7 @@ extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append)); */ -extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, +extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -116,7 +116,7 @@ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, uInt size_extrafield_global, const char* comment, int method, - int level)); + int level); /* Open a file in the ZIP for writing. filename : the filename in zip (if NULL, '-' without quote will be used @@ -130,20 +130,20 @@ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, level contain the level of compression (can be Z_DEFAULT_COMPRESSION) */ -extern int ZEXPORT zipWriteInFileInZip OF((zipFile file, +extern int ZEXPORT zipWriteInFileInZip (zipFile file, const voidp buf, - unsigned len)); + unsigned len); /* Write data in the zipfile */ -extern int ZEXPORT zipCloseFileInZip OF((zipFile file)); +extern int ZEXPORT zipCloseFileInZip (zipFile file); /* Close the current file in the zipfile */ -extern int ZEXPORT zipClose OF((zipFile file, - const char* global_comment)); +extern int ZEXPORT zipClose (zipFile file, + const char* global_comment); /* Close the zipfile */