| @@ -1,39 +1,39 @@ | | | @@ -1,39 +1,39 @@ |
1 | $NetBSD: patch-ac,v 1.4 2007/07/01 10:12:03 adam Exp $ | | 1 | $NetBSD: patch-ac,v 1.5 2008/01/17 21:22:35 adam Exp $ |
2 | | | 2 | |
3 | --- common/unzip.h.orig 2007-06-16 23:27:34.000000000 +0200 | | 3 | --- common/unzip.h.orig 2008-01-13 00:08:46.000000000 +0100 |
4 | +++ common/unzip.h | | 4 | +++ common/unzip.h |
5 | @@ -138,9 +138,9 @@ typedef struct unz_file_info_s | | 5 | @@ -141,9 +141,9 @@ typedef struct unz_file_info_s |
6 | tm_unz tmu_date; | | 6 | tm_unz tmu_date; |
7 | } unz_file_info; | | 7 | } unz_file_info; |
8 | | | 8 | |
9 | -extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, | | 9 | -extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, |
10 | +extern int unzStringFileNameCompare (const char* fileName1, | | 10 | +extern int unzStringFileNameCompare (const char* fileName1, |
11 | const char* fileName2, | | 11 | const char* fileName2, |
12 | - int iCaseSensitivity)); | | 12 | - int iCaseSensitivity)); |
13 | + int iCaseSensitivity); | | 13 | + int iCaseSensitivity); |
14 | /* | | 14 | /* |
15 | Compare two filename (fileName1,fileName2). | | 15 | Compare two filename (fileName1,fileName2). |
16 | If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) | | 16 | If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) |
17 | @@ -151,7 +151,7 @@ extern int ZEXPORT unzStringFileNameComp | | 17 | @@ -154,7 +154,7 @@ extern int ZEXPORT unzStringFileNameComp |
18 | */ | | 18 | */ |
19 | | | 19 | |
20 | | | 20 | |
21 | -extern unzFile ZEXPORT unzOpen OF((const char *path)); | | 21 | -extern unzFile ZEXPORT unzOpen OF((const char *path)); |
22 | +extern unzFile unzOpen (const char *path); | | 22 | +extern unzFile unzOpen (const char *path); |
23 | /* | | 23 | /* |
24 | Open a Zip file. path contain the full pathname (by example, | | 24 | Open a Zip file. path contain the full pathname (by example, |
25 | on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer | | 25 | on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer |
26 | @@ -162,24 +162,24 @@ extern unzFile ZEXPORT unzOpen OF((const | | 26 | @@ -165,24 +165,24 @@ extern unzFile ZEXPORT unzOpen OF((const |
27 | of this unzip package. | | 27 | of this unzip package. |
28 | */ | | 28 | */ |
29 | | | 29 | |
30 | -extern int ZEXPORT unzClose OF((unzFile file)); | | 30 | -extern int ZEXPORT unzClose OF((unzFile file)); |
31 | +extern int unzClose (unzFile file); | | 31 | +extern int unzClose (unzFile file); |
32 | /* | | 32 | /* |
33 | Close a ZipFile opened with unzipOpen. | | 33 | Close a ZipFile opened with unzipOpen. |
34 | If there is files inside the .Zip opened with unzOpenCurrentFile (see later), | | 34 | If there is files inside the .Zip opened with unzOpenCurrentFile (see later), |
35 | these files MUST be closed with unzipCloseCurrentFile before call unzipClose. | | 35 | these files MUST be closed with unzipCloseCurrentFile before call unzipClose. |
36 | return UNZ_OK if there is no problem. */ | | 36 | return UNZ_OK if there is no problem. */ |
37 | | | 37 | |
38 | -extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, | | 38 | -extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, |
39 | - unz_global_info *pglobal_info)); | | 39 | - unz_global_info *pglobal_info)); |
| @@ -43,98 +43,98 @@ $NetBSD: patch-ac,v 1.4 2007/07/01 10:12 | | | @@ -43,98 +43,98 @@ $NetBSD: patch-ac,v 1.4 2007/07/01 10:12 |
43 | Write info about the ZipFile in the *pglobal_info structure. | | 43 | Write info about the ZipFile in the *pglobal_info structure. |
44 | No preparation of the structure is needed | | 44 | No preparation of the structure is needed |
45 | return UNZ_OK if there is no problem. */ | | 45 | return UNZ_OK if there is no problem. */ |
46 | | | 46 | |
47 | | | 47 | |
48 | -extern int ZEXPORT unzGetGlobalComment OF((unzFile file, | | 48 | -extern int ZEXPORT unzGetGlobalComment OF((unzFile file, |
49 | +extern int unzGetGlobalComment (unzFile file, | | 49 | +extern int unzGetGlobalComment (unzFile file, |
50 | char *szComment, | | 50 | char *szComment, |
51 | - uLong uSizeBuf)); | | 51 | - uLong uSizeBuf)); |
52 | + uLong uSizeBuf); | | 52 | + uLong uSizeBuf); |
53 | /* | | 53 | /* |
54 | Get the global comment string of the ZipFile, in the szComment buffer. | | 54 | Get the global comment string of the ZipFile, in the szComment buffer. |
55 | uSizeBuf is the size of the szComment buffer. | | 55 | uSizeBuf is the size of the szComment buffer. |
56 | @@ -190,22 +190,22 @@ extern int ZEXPORT unzGetGlobalComment O | | 56 | @@ -193,22 +193,22 @@ extern int ZEXPORT unzGetGlobalComment O |
57 | /***************************************************************************/ | | 57 | /***************************************************************************/ |
58 | /* Unzip package allow you browse the directory of the zipfile */ | | 58 | /* Unzip package allow you browse the directory of the zipfile */ |
59 | | | 59 | |
60 | -extern int ZEXPORT unzGoToFirstFile OF((unzFile file)); | | 60 | -extern int ZEXPORT unzGoToFirstFile OF((unzFile file)); |
61 | +extern int unzGoToFirstFile (unzFile file); | | 61 | +extern int unzGoToFirstFile (unzFile file); |
62 | /* | | 62 | /* |
63 | Set the current file of the zipfile to the first file. | | 63 | Set the current file of the zipfile to the first file. |
64 | return UNZ_OK if there is no problem | | 64 | return UNZ_OK if there is no problem |
65 | */ | | 65 | */ |
66 | | | 66 | |
67 | -extern int ZEXPORT unzGoToNextFile OF((unzFile file)); | | 67 | -extern int ZEXPORT unzGoToNextFile OF((unzFile file)); |
68 | +extern int unzGoToNextFile (unzFile file); | | 68 | +extern int unzGoToNextFile (unzFile file); |
69 | /* | | 69 | /* |
70 | Set the current file of the zipfile to the next file. | | 70 | Set the current file of the zipfile to the next file. |
71 | return UNZ_OK if there is no problem | | 71 | return UNZ_OK if there is no problem |
72 | return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. | | 72 | return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. |
73 | */ | | 73 | */ |
74 | | | 74 | |
75 | -extern int ZEXPORT unzLocateFile OF((unzFile file, | | 75 | -extern int ZEXPORT unzLocateFile OF((unzFile file, |
76 | +extern int unzLocateFile (unzFile file, | | 76 | +extern int unzLocateFile (unzFile file, |
77 | const char *szFileName, | | 77 | const char *szFileName, |
78 | - int iCaseSensitivity)); | | 78 | - int iCaseSensitivity)); |
79 | + int iCaseSensitivity); | | 79 | + int iCaseSensitivity); |
80 | /* | | 80 | /* |
81 | Try locate the file szFileName in the zipfile. | | 81 | Try locate the file szFileName in the zipfile. |
82 | For the iCaseSensitivity signification, see unzStringFileNameCompare | | 82 | For the iCaseSensitivity signification, see unzStringFileNameCompare |
83 | @@ -216,14 +216,14 @@ extern int ZEXPORT unzLocateFile OF((unz | | 83 | @@ -219,14 +219,14 @@ extern int ZEXPORT unzLocateFile OF((unz |
84 | */ | | 84 | */ |
85 | | | 85 | |
86 | | | 86 | |
87 | -extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, | | 87 | -extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, |
88 | +extern int unzGetCurrentFileInfo (unzFile file, | | 88 | +extern int unzGetCurrentFileInfo (unzFile file, |
89 | unz_file_info *pfile_info, | | 89 | unz_file_info *pfile_info, |
90 | char *szFileName, | | 90 | char *szFileName, |
91 | uLong fileNameBufferSize, | | 91 | uLong fileNameBufferSize, |
92 | void *extraField, | | 92 | void *extraField, |
93 | uLong extraFieldBufferSize, | | 93 | uLong extraFieldBufferSize, |
94 | char *szComment, | | 94 | char *szComment, |
95 | - uLong commentBufferSize)); | | 95 | - uLong commentBufferSize)); |
96 | + uLong commentBufferSize); | | 96 | + uLong commentBufferSize); |
97 | /* | | 97 | /* |
98 | Get Info about the current file | | 98 | Get Info about the current file |
99 | if pfile_info!=NULL, the *pfile_info structure will contain somes info about | | 99 | if pfile_info!=NULL, the *pfile_info structure will contain somes info about |
100 | @@ -242,22 +242,22 @@ extern int ZEXPORT unzGetCurrentFileInfo | | 100 | @@ -245,22 +245,22 @@ extern int ZEXPORT unzGetCurrentFileInfo |
101 | from it, and close it (you can close it before reading all the file) | | 101 | from it, and close it (you can close it before reading all the file) |
102 | */ | | 102 | */ |
103 | | | 103 | |
104 | -extern int ZEXPORT unzOpenCurrentFile OF((unzFile file)); | | 104 | -extern int ZEXPORT unzOpenCurrentFile OF((unzFile file)); |
105 | +extern int unzOpenCurrentFile (unzFile file); | | 105 | +extern int unzOpenCurrentFile (unzFile file); |
106 | /* | | 106 | /* |
107 | Open for reading data the current file in the zipfile. | | 107 | Open for reading data the current file in the zipfile. |
108 | If there is no error, the return value is UNZ_OK. | | 108 | If there is no error, the return value is UNZ_OK. |
109 | */ | | 109 | */ |
110 | | | 110 | |
111 | -extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); | | 111 | -extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); |
112 | +extern int unzCloseCurrentFile (unzFile file); | | 112 | +extern int unzCloseCurrentFile (unzFile file); |
113 | /* | | 113 | /* |
114 | Close the file in zip opened with unzOpenCurrentFile | | 114 | Close the file in zip opened with unzOpenCurrentFile |
115 | Return UNZ_CRCERROR if all the file was read but the CRC is not good | | 115 | Return UNZ_CRCERROR if all the file was read but the CRC is not good |
116 | */ | | 116 | */ |
117 | | | 117 | |
118 | | | 118 | |
119 | -extern int ZEXPORT unzReadCurrentFile OF((unzFile file, | | 119 | -extern int ZEXPORT unzReadCurrentFile OF((unzFile file, |
120 | +extern int unzReadCurrentFile (unzFile file, | | 120 | +extern int unzReadCurrentFile (unzFile file, |
121 | voidp buf, | | 121 | voidp buf, |
122 | - unsigned len)); | | 122 | - unsigned len)); |
123 | + unsigned len); | | 123 | + unsigned len); |
124 | /* | | 124 | /* |
125 | Read bytes from the current file (opened by unzOpenCurrentFile) | | 125 | Read bytes from the current file (opened by unzOpenCurrentFile) |
126 | buf contain buffer where data must be copied | | 126 | buf contain buffer where data must be copied |
127 | @@ -269,19 +269,19 @@ extern int ZEXPORT unzReadCurrentFile OF | | 127 | @@ -272,19 +272,19 @@ extern int ZEXPORT unzReadCurrentFile OF |
128 | (UNZ_ERRNO for IO error, or zLib error for uncompress error) | | 128 | (UNZ_ERRNO for IO error, or zLib error for uncompress error) |
129 | */ | | 129 | */ |
130 | | | 130 | |
131 | -extern z_off_t ZEXPORT unztell OF((unzFile file)); | | 131 | -extern z_off_t ZEXPORT unztell OF((unzFile file)); |
132 | +extern z_off_t unztell (unzFile file); | | 132 | +extern z_off_t unztell (unzFile file); |
133 | /* | | 133 | /* |
134 | Give the current position in uncompressed data | | 134 | Give the current position in uncompressed data |
135 | */ | | 135 | */ |
136 | | | 136 | |
137 | -extern int ZEXPORT unzeof OF((unzFile file)); | | 137 | -extern int ZEXPORT unzeof OF((unzFile file)); |
138 | +extern int unzeof (unzFile file); | | 138 | +extern int unzeof (unzFile file); |
139 | /* | | 139 | /* |
140 | return 1 if the end of file was reached, 0 elsewhere | | 140 | return 1 if the end of file was reached, 0 elsewhere |