Changeset 95239 in vbox for trunk/src/libs/zlib-1.2.12/contrib/minizip/miniunz.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/miniunz.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/miniunz.c

@@ -46 +46 @@
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 
 #ifdef _WIN32
@@ -81 +82 @@
     dosdate : the new date at the MSDos format (4 bytes)
     tmu_date : the SAME new date at the tm_unz format */
-void change_file_date(filename,dosdate,tmu_date)
+static void change_file_date(filename,dosdate,tmu_date)
     const char *filename;
     uLong dosdate;
@@ -98 +99 @@
   CloseHandle(hFile);
 #else
-#ifdef unix || __APPLE__
+#if defined(unix) || defined(__APPLE__)
+  (void)dosdate;
   struct utimbuf ut;
   struct tm newdate;
@@ -122 +124 @@
    As I don't know well Unix, I wait feedback for the unix portion */
 
-int mymkdir(dirname)
+static int mymkdir(dirname)
     const char* dirname;
 {
@@ -136 +138 @@
 }
 
-int makedir (newdir)
-    char *newdir;
+static int makedir (newdir)
+    const char *newdir;
 {
   char *buffer ;
   char *p;
-  int  len = (int)strlen(newdir);
-
-  if (len <= 0)
+  size_t len = strlen(newdir);
+
+  if (len == 0)
     return 0;
 
@@ -186 +188 @@
 }
 
-void do_banner()
+static void do_banner()
 {
     printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
@@ -192 +194 @@
 }
 
-void do_help()
+static void do_help()
 {
     printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
@@ -204 +206 @@
 }
 
-void Display64BitsSize(ZPOS64_T n, int size_char)
+static void Display64BitsSize(ZPOS64_T n, int size_char)
 {
   /* to avoid compatibility problem , we do here the conversion */
@@ -232 +234 @@
 }
 
-int do_list(uf)
+static int do_list(uf)
     unzFile uf;
 {
@@ -310 +312 @@
 
 
-int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
+static int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
     unzFile uf;
     const int* popt_extract_without_path;
@@ -325 +327 @@
 
     unz_file_info64 file_info;
-    uLong ratio=0;
     err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
 
@@ -440 +441 @@
                 }
                 if (err>0)
-                    if (fwrite(buf,err,1,fout)!=1)
+                    if (fwrite(buf,(unsigned)err,1,fout)!=1)
                     {
                         printf("error in writing extracted file\n");
@@ -473 +474 @@
 
 
-int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
+static int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
     unzFile uf;
     int opt_extract_without_path;
@@ -482 +483 @@
     unz_global_info64 gi;
     int err;
-    FILE* fout=NULL;
 
     err = unzGetGlobalInfo64(uf,&gi);
@@ -509 +509 @@
 }
 
-int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
+static int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
     unzFile uf;
     const char* filename;
@@ -516 +516 @@
     const char* password;
 {
-    int err = UNZ_OK;
     if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
     {

@@ -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