Index: third_party/zlib/contrib/minizip/crypt.h |
=================================================================== |
--- third_party/zlib/contrib/minizip/crypt.h (revision 113739) |
+++ third_party/zlib/contrib/minizip/crypt.h (working copy) |
@@ -87,13 +87,12 @@ |
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */ |
# endif |
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting) |
- const char *passwd; /* password string */ |
- unsigned char *buf; /* where to write header */ |
- int bufSize; |
- unsigned long* pkeys; |
- const unsigned long* pcrc_32_tab; |
- unsigned long crcForCrypting; |
+static int crypthead(const char* passwd, /* password string */ |
+ unsigned char* buf, /* where to write header */ |
+ int bufSize, |
+ unsigned long* pkeys, |
+ const unsigned long* pcrc_32_tab, |
+ unsigned long crcForCrypting) |
{ |
int n; /* index in random header */ |
int t; /* temporary */ |
@@ -124,8 +123,8 @@ |
{ |
buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t); |
} |
- buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t); |
- buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t); |
+ buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t); |
+ buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t); |
return n; |
} |