diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2014-06-10 20:27:13 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2014-06-10 20:27:13 +0000 |
| commit | 713b83f7b406858269863d92865b715470d6335c (patch) | |
| tree | 79eb2733939d29388f0776f68da4b053427a61c9 /src/minizip/zip.c.diff | |
| parent | 82e61ae9d68114bdcd6fafdb8bf823ae9ce69bef (diff) | |
Added the following compiler flags:
* -Wcast-qual
* -Wmissing-parameter-type
* -Wold-style-definition
Diffstat (limited to 'src/minizip/zip.c.diff')
| -rw-r--r-- | src/minizip/zip.c.diff | 46 |
1 files changed, 36 insertions, 10 deletions
diff --git a/src/minizip/zip.c.diff b/src/minizip/zip.c.diff index 204d985..1eca214 100644 --- a/src/minizip/zip.c.diff +++ b/src/minizip/zip.c.diff @@ -1,6 +1,14 @@ ---- zip.c.orig 2013-02-24 08:32:30.000000000 +0100 -+++ zip.c 2014-05-24 13:52:45.570151611 +0200 -@@ -186,7 +186,7 @@ +--- zip.c.orig 2014-06-10 18:55:32.778807408 +0200 ++++ zip.c 2014-06-10 22:24:28.372483395 +0200 +@@ -33,6 +33,7 @@ + # include <stddef.h> + # include <string.h> + # include <stdlib.h> ++# include <stdint.h> + #endif + #ifdef NO_ERRNO_H + extern int errno; +@@ -186,7 +187,7 @@ #include "crypt.h" #endif @@ -9,7 +17,16 @@ { linkedlist_datablock_internal* ldi; ldi = (linkedlist_datablock_internal*) -@@ -637,7 +637,7 @@ +@@ -238,7 +239,7 @@ + } + + ldi = ll->last_block; +- from_copy = (unsigned char*)buf; ++ from_copy = (const unsigned char*)buf; + + while (len>0) + { +@@ -637,7 +638,7 @@ return relativeOffset; } @@ -18,7 +35,7 @@ { int err=ZIP_OK; ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ -@@ -955,7 +955,7 @@ +@@ -955,7 +956,7 @@ return zipOpen3(pathname,append,NULL,NULL); } @@ -27,7 +44,16 @@ { /* write the local header */ int err; -@@ -1752,7 +1752,7 @@ +@@ -1450,7 +1451,7 @@ + else + #endif + { +- zi->ci.stream.next_in = (Bytef*)buf; ++ zi->ci.stream.next_in = (void*) (uintptr_t) buf; + zi->ci.stream.avail_in = len; + + while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0)) +@@ -1752,7 +1753,7 @@ return zipCloseFileInZipRaw (file,0,0); } @@ -36,7 +62,7 @@ { int err = ZIP_OK; ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset; -@@ -1774,7 +1774,7 @@ +@@ -1774,7 +1775,7 @@ return err; } @@ -45,7 +71,7 @@ { int err = ZIP_OK; -@@ -1813,7 +1813,8 @@ +@@ -1813,7 +1814,8 @@ } return err; } @@ -55,7 +81,7 @@ { int err = ZIP_OK; -@@ -1861,7 +1862,7 @@ +@@ -1861,7 +1863,7 @@ return err; } @@ -64,7 +90,7 @@ { int err = ZIP_OK; uInt size_global_comment = 0; -@@ -1879,6 +1880,18 @@ +@@ -1879,6 +1881,18 @@ return err; } |