diff options
| author | Xavier Roche <roche@httrack.com> | 2023-11-18 11:03:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-18 11:03:53 +0100 |
| commit | 300f906d7829293715f8e35855207ff42a395d8d (patch) | |
| tree | 5394f22a853dbf11c12d2b4deae43d06bac34e0d /src/minizip/mztools.c.diff | |
| parent | 8316bc0e974c2a84a35f2175d413804c9b5be90c (diff) | |
| parent | 3bffe8ca4659fbca47dcc8fba0472fadcf659a51 (diff) | |
Merge pull request #265 from jayaddison/maintenance/update-zlib-1.3
Maintenance: update vendored minizip code to the version distributed with zlib v1.3
Diffstat (limited to 'src/minizip/mztools.c.diff')
| -rw-r--r-- | src/minizip/mztools.c.diff | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/minizip/mztools.c.diff b/src/minizip/mztools.c.diff index 1e4f2cd..255d6a1 100644 --- a/src/minizip/mztools.c.diff +++ b/src/minizip/mztools.c.diff @@ -1,5 +1,5 @@ ---- mztools.c.orig 2012-01-21 20:58:45.000000000 +0100 -+++ mztools.c 2014-05-24 13:27:22.516230485 +0200 +--- mztools.c.orig 2023-11-17 16:21:50.359864777 +0000 ++++ mztools.c 2023-11-17 16:25:28.087859290 +0000 @@ -10,6 +10,7 @@ #include <string.h> #include "zlib.h" @@ -8,23 +8,7 @@ #define READ_8(adr) ((unsigned char)*(adr)) #define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) ) -@@ -27,12 +28,9 @@ - WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \ - } while(0) - --extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered) --const char* file; --const char* fileOut; --const char* fileOutTmp; --uLong* nRecovered; --uLong* bytesRecovered; -+int ZEXPORT unzRepair(const char* file, const char* fileOut, -+ const char* fileOutTmp, uLong* nRecovered, -+ uLong* bytesRecovered) - { - int err = Z_OK; - FILE* fpZip = fopen(file, "rb"); -@@ -147,8 +145,8 @@ +@@ -141,8 +142,8 @@ /* Central directory entry */ { char header[46]; @@ -35,7 +19,7 @@ WRITE_32(header, 0x02014b50); WRITE_16(header + 4, version); WRITE_16(header + 6, version); -@@ -195,7 +193,7 @@ +@@ -189,7 +190,7 @@ /* Comment field */ if (comsize > 0) { @@ -44,7 +28,7 @@ offsetCD += comsize; } else { err = Z_ERRNO; -@@ -222,8 +220,8 @@ +@@ -216,8 +217,8 @@ { int entriesZip = entries; char header[22]; @@ -55,7 +39,7 @@ if (entriesZip > 0xffff) { entriesZip = 0xffff; } -@@ -241,7 +239,7 @@ +@@ -235,7 +236,7 @@ /* Comment field */ if (comsize > 0) { |