minizip: tiny fixes:

fix cppcheck notes: (error) Resource leak: fpOutCD (warning) %lld in format string (no. 2) requires 'long long'...
psi-im · Jun 26, 2018 · 369310c · 369310c
1 parent 869ee6d
commit 369310c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/zip/minizip/minizip.c b/tools/zip/minizip/minizip.c
@@ -232,7 +232,7 @@ int isLargeFile(const char* filename)
     int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
     pos = FTELLO_FUNC(pFile);
 
-                printf("File : %s is %lld bytes\n", filename, pos);
+                printf("File : %s is %llu bytes\n", filename, (unsigned long long)pos);
 
     if(pos >= 0xffffffff)
      largeFile = 1;

diff --git a/tools/zip/minizip/mztools.c b/tools/zip/minizip/mztools.c
@@ -38,7 +38,7 @@ uLong* bytesRecovered;
   FILE* fpZip = fopen(file, "rb");
   FILE* fpOut = fopen(fileOut, "wb");
   FILE* fpOutCD = fopen(fileOutTmp, "wb");
-  if (fpZip != NULL &&  fpOut != NULL) {
+  if (fpZip != NULL && fpOut != NULL && fpOutCD != NULL) {
     int entries = 0;
     uLong totalBytes = 0;
     char header[30];