Fix compile error & warning for xcode. (#378)

halx99 · minggo · commit ece05ff33c22 · 2019-09-25T09:49:50.000+08:00
* Upgrade minizip to 1.2.0

* Fix compile error &amp; warning for xcode.
diff --git a/unzip/crypt.h b/unzip/crypt.h
@@ -65,7 +65,7 @@ static uint8_t update_keys(uint32_t *pkeys, const z_crc_t *pcrc_32_tab, int32_t
     (*(pkeys + 1)) += (*(pkeys + 0)) & 0xff;
     (*(pkeys + 1)) = (*(pkeys + 1)) * 134775813L + 1;
     {
-        register int32_t keyshift = (int32_t)((*(pkeys + 1)) >> 24);
+        int32_t keyshift = (int32_t)((*(pkeys + 1)) >> 24);
         (*(pkeys + 2)) = (uint32_t)CRC32((*(pkeys + 2)), keyshift);
     }
     return c;
diff --git a/unzip/unzip.cpp b/unzip/unzip.cpp
@@ -537,7 +537,7 @@ extern unzFile ZEXPORT unzOpen64(const void *path)
 extern unzFile ZEXPORT unzOpenBuffer(const void* buffer, uLong size)
 {
 	zlib_filefunc_def memory_file = { 0 };
-	ourmemory_s oms = { (char*)(buffer), size, size, 0, 0};
+	ourmemory_s oms = { (char*)const_cast<void*>(buffer), static_cast<uint32_t>(size), 0, 0, 0};
 	fill_memory_filefunc(&memory_file, &oms);
 	return unzOpen2(nullptr, &memory_file);
 }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ static uint8_t update_keys(uint32_t pkeys, const z_crc_t pcrc_32_tab, int32_t`
`65`	`65`	`((pkeys + 1)) += ((pkeys + 0)) & 0xff;`
`66`	`66`	`((pkeys + 1)) = ((pkeys + 1)) * 134775813L + 1;`
`67`	`67`	`{`
`68`		`- register int32_t keyshift = (int32_t)((*(pkeys + 1)) >> 24);`
	`68`	`+ int32_t keyshift = (int32_t)((*(pkeys + 1)) >> 24);`
`69`	`69`	`((pkeys + 2)) = (uint32_t)CRC32(((pkeys + 2)), keyshift);`
`70`	`70`	`}`
`71`	`71`	`return c;`
Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ extern unzFile ZEXPORT unzOpen64(const void *path)`
`537`	`537`	`extern unzFile ZEXPORT unzOpenBuffer(const void* buffer, uLong size)`
`538`	`538`	`{`
`539`	`539`	`zlib_filefunc_def memory_file = { 0 };`
`540`		`- ourmemory_s oms = { (char*)(buffer), size, size, 0, 0};`
	`540`	`+ ourmemory_s oms = { (char)const_cast<void>(buffer), static_cast<uint32_t>(size), 0, 0, 0};`
`541`	`541`	`fill_memory_filefunc(&memory_file, &oms);`
`542`	`542`	`return unzOpen2(nullptr, &memory_file);`
`543`	`543`	`}`