aboutsummaryrefslogtreecommitdiff
path: root/zlib/contrib/minizip/unzip.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-12 13:55:55 +0100
committermarha <marha@users.sourceforge.net>2013-11-12 13:56:28 +0100
commit0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (patch)
treeeee062f34219e5c5d3f3e61caa5d3c39a5185794 /zlib/contrib/minizip/unzip.c
parent3893ee9f6b12465239b63d08763bd9ba0bd329e5 (diff)
parent4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff)
downloadvcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.gz
vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.bz2
vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Updated zlib to 1.2.8 Conflicts: zlib/win32/zlib.def
Diffstat (limited to 'zlib/contrib/minizip/unzip.c')
-rw-r--r--zlib/contrib/minizip/unzip.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/zlib/contrib/minizip/unzip.c b/zlib/contrib/minizip/unzip.c
index affad4bfe..909350435 100644
--- a/zlib/contrib/minizip/unzip.c
+++ b/zlib/contrib/minizip/unzip.c
@@ -188,7 +188,7 @@ typedef struct
# ifndef NOUNCRYPT
unsigned long keys[3]; /* keys defining the pseudo-random sequence */
- const unsigned long* pcrc_32_tab;
+ const z_crc_t* pcrc_32_tab;
# endif
} unz64_s;
@@ -801,9 +801,9 @@ extern unzFile ZEXPORT unzOpen64 (const void *path)
}
/*
- Close a ZipFile opened with unzipOpen.
- If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
- these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+ Close a ZipFile opened with unzOpen.
+ If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+ these files MUST be closed with unzCloseCurrentFile before call unzClose.
return UNZ_OK if there is no problem. */
extern int ZEXPORT unzClose (unzFile file)
{
@@ -1223,7 +1223,7 @@ extern int ZEXPORT unzGoToNextFile (unzFile file)
/*
Try locate the file szFileName in the zipfile.
- For the iCaseSensitivity signification, see unzipStringFileNameCompare
+ For the iCaseSensitivity signification, see unzStringFileNameCompare
return value :
UNZ_OK if the file is found. It becomes the current file.
@@ -1998,7 +1998,7 @@ extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
}
/*
- Close the file in zip opened with unzipOpenCurrentFile
+ Close the file in zip opened with unzOpenCurrentFile
Return UNZ_CRCERROR if all the file was read but the CRC is not good
*/
extern int ZEXPORT unzCloseCurrentFile (unzFile file)