Changeset 95239 in vbox for trunk/src/libs/zlib-1.2.12/contrib/minizip/minizip.c

Timestamp:

Jun 9, 2022 9:09:44 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151769

Message:

libs/zlib: Upgrade to 1.2.12, bugref:8515

Location:

trunk/src/libs/zlib-1.2.12

Files:

• . (modified) (1 prop)
• contrib/minizip/minizip.c (modified) (16 diffs)

trunk/src/libs/zlib-1.2.12

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750

trunk/src/libs/zlib-1.2.12/contrib/minizip/minizip.c

@@ -72 +72 @@
 
 #ifdef _WIN32
-uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
+static int filetime(f, tmzip, dt)
+    const char *f;          /* name of file to get info on */
     tm_zip *tmzip;             /* return value: access, modific. and creation times */
     uLong *dt;             /* dostime */
@@ -95 +95 @@
 }
 #else
-#ifdef unix || __APPLE__
-uLong filetime(f, tmzip, dt)
-    char *f;               /* name of file to get info on */
+#if defined(unix) || defined(__APPLE__)
+static int filetime(f, tmzip, dt)
+    const char *f;         /* name of file to get info on */
     tm_zip *tmzip;         /* return value: access, modific. and creation times */
     uLong *dt;             /* dostime */
 {
+  (void)dt;
   int ret=0;
   struct stat s;        /* results of stat() */
@@ -109 +110 @@
   {
     char name[MAXFILENAME+1];
-    int len = strlen(f);
+    size_t len = strlen(f);
     if (len > MAXFILENAME)
       len = MAXFILENAME;
@@ -139 +140 @@
 #else
 uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
+    const char *f;          /* name of file to get info on */
     tm_zip *tmzip;             /* return value: access, modific. and creation times */
     uLong *dt;             /* dostime */
@@ -151 +152 @@
 
 
-int check_exist_file(filename)
+static int check_exist_file(filename)
     const char* filename;
 {
@@ -164 +165 @@
 }
 
-void do_banner()
+static void do_banner()
 {
     printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
@@ -170 +171 @@
 }
 
-void do_help()
+static void do_help()
 {
     printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
@@ -183 +184 @@
 /* calculate the CRC32 of a file,
    because to encrypt a file, we need known the CRC32 of the file before */
-int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
+static int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
 {
    unsigned long calculate_crc=0;
@@ -200 +201 @@
         {
             err = ZIP_OK;
-            size_read = (int)fread(buf,1,size_buf,fin);
+            size_read = fread(buf,1,size_buf,fin);
             if (size_read < size_buf)
                 if (feof(fin)==0)
@@ -209 +210 @@
 
             if (size_read>0)
-                calculate_crc = crc32(calculate_crc,buf,size_read);
+                calculate_crc = crc32_z(calculate_crc,buf,size_read);
             total_read += size_read;
 
@@ -222 +223 @@
 }
 
-int isLargeFile(const char* filename)
+static int isLargeFile(const char* filename)
 {
   int largeFile = 0;
@@ -230 +231 @@
   if(pFile != NULL)
   {
-    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
-    pos = FTELLO_FUNC(pFile);
+    FSEEKO_FUNC(pFile, 0, SEEK_END);
+    pos = (ZPOS64_T)FTELLO_FUNC(pFile);
 
                 printf("File : %s is %lld bytes\n", filename, pos);
@@ -256 +257 @@
     int zipok;
     int err=0;
-    int size_buf=0;
+    size_t size_buf=0;
     void* buf=NULL;
     const char* password=NULL;
@@ -397 +398 @@
             {
                 FILE * fin;
-                int size_read;
+                size_t size_read;
                 const char* filenameinzip = argv[i];
                 const char *savefilenameinzip;
@@ -473 +474 @@
                     {
                         err = ZIP_OK;
-                        size_read = (int)fread(buf,1,size_buf,fin);
+                        size_read = fread(buf,1,size_buf,fin);
                         if (size_read < size_buf)
                             if (feof(fin)==0)
@@ -483 +484 @@
                         if (size_read>0)
                         {
-                            err = zipWriteInFileInZip (zf,buf,size_read);
+                            err = zipWriteInFileInZip (zf,buf,(unsigned)size_read);
                             if (err<0)
                             {

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750