all: Fix some compiler warnings

Author: dimhotepus

XUnzip.cpp

@@ -89,7 +89,7 @@ typedef unsigned short WORD;
 #define _tcsicmp stricmp
 #define _tcsncpy strncpy
 #define _tcsstr strstr
-#define _sntprintf _snprintf
+#define _sntprintf snprintf
 #define INVALID_HANDLE_VALUE nullptr
 #define INVALID_SET_FILE_POINTER 0xFFFFFFFFUL
 #ifndef _T
@@ -119,7 +119,6 @@ typedef unsigned short WORD;
 enum ZipMode { ZIP_HANDLE = 1, ZIP_FILENAME = 2, ZIP_MEMORY = 3 };
 
 #define zmalloc(len) malloc(len)
-
 #define zfree(p) free(p)
 
 namespace {
@@ -1635,7 +1634,7 @@ int huft_build(uInt *b,           // code lengths in bits (all assumed <= BMAX)
 #define C2 C0 C0 C0 C0
 #define C4 C2 C2 C2 C2
   C4;
-  p;  // clear c[]--assume BMAX+1 is 16
+  // clear c[]--assume BMAX+1 is 16
   p = b;
   i = n;
   do {
@@ -2398,7 +2397,6 @@ int inflate(z_streamp z, int f) {
         z->state->mode = IM_DICT1;
       case IM_DICT1:
         IM_NEEDBYTE;
-        r;
         z->state->sub.check.need += (uLong)IM_NEXTBYTE;
         z->adler = z->state->sub.check.need;
         z->state->mode = IM_DICT0;
@@ -2850,7 +2848,7 @@ uLong unzlocal_SearchCentralDir(LUFILE *fin) {
   long uMaxBack{0xFFFF};  // maximum size of global comment
   if (uMaxBack > uSizeFile) uMaxBack = uSizeFile;
 
-  constexpr size_t bufSize{BUFREADCOMMENT + 4};
+  constexpr long bufSize{BUFREADCOMMENT + 4};
   auto buf = std::make_unique<unsigned char[]>(bufSize);
   if (!buf) return 0xFFFFFFFF;
 
@@ -3043,11 +3041,13 @@ int unzlocal_GetCurrentFileInfoInternal(
     err = UNZ_ERRNO;
 
   // we check the magic
-  if (err == UNZ_OK)
-    if (unzlocal_getLong(s->file, &uMagic) != UNZ_OK)
+  if (err == UNZ_OK) {
+    if (unzlocal_getLong(s->file, &uMagic) != UNZ_OK) {
       err = UNZ_ERRNO;
-    else if (uMagic != 0x02014b50)
+    } else if (uMagic != 0x02014b50) {
       err = UNZ_BADZIPFILE;
+    }
+  }
 
   if (unzlocal_getShort(s->file, &file_info.version) != UNZ_OK) err = UNZ_ERRNO;
 
@@ -3115,11 +3115,13 @@ int unzlocal_GetCurrentFileInfoInternal(
     else
       uSizeRead = extraFieldBufferSize;
 
-    if (lSeek != 0)
-      if (lufseek(s->file, lSeek, SEEK_CUR) == 0)
+    if (lSeek != 0) {
+      if (lufseek(s->file, lSeek, SEEK_CUR) == 0) {
         lSeek = 0;
-      else
+      } else {
         err = UNZ_ERRNO;
+      }
+    }
 
     if ((file_info.size_file_extra > 0) && (extraFieldBufferSize > 0))
       if (lufread(extraField, (uInt)uSizeRead, 1, s->file) != 1)
@@ -3138,10 +3140,9 @@ int unzlocal_GetCurrentFileInfoInternal(
       uSizeRead = commentBufferSize;
 
     if (lSeek != 0)
-      if (lufseek(s->file, lSeek, SEEK_CUR) == 0) {
-      }  // unused lSeek=0;
-      else
+      if (lufseek(s->file, lSeek, SEEK_CUR) != 0) {
         err = UNZ_ERRNO;
+      }
 
     if ((file_info.size_file_comment > 0) && (commentBufferSize > 0))
       if (lufread(szComment, (uInt)uSizeRead, 1, s->file) != 1) err = UNZ_ERRNO;
@@ -3439,7 +3440,7 @@ int unzReadCurrentFile(unzFile file, voidp buf, unsigned len,
 
   file_in_zip_read_info_s *pfile_in_zip_read_info = s->pfile_in_zip_read;
   if (pfile_in_zip_read_info == nullptr) return UNZ_PARAMERROR;
-  if ((pfile_in_zip_read_info->read_buffer == nullptr)) {
+  if (pfile_in_zip_read_info->read_buffer == nullptr) {
     return UNZ_END_OF_LIST_OF_FILE;
   }
 
@@ -3910,7 +3911,7 @@ ZRESULT TUnzip::Get(int index, ZIPENTRY *ze) {
   bool readonly = (a & 0x00800000) == 0;
   // bool readable=  (a&0x01000000)!=0; // unused
   // bool executable=(a&0x00400000)!=0; // unused
-  bool hidden = false, system = false, archive = true;
+  [[maybe_unused]] bool hidden = false, system = false, archive = true;
   // but in normal hostmodes these are overridden by the lower half...
   int host = ufi.version >> 8;
   if (host == 0 || host == 7 || host == 11 || host == 14) {
@@ -3920,11 +3921,6 @@ ZRESULT TUnzip::Get(int index, ZIPENTRY *ze) {
     isdir = (a & 0x00000010) != 0;
     archive = (a & 0x00000020) != 0;
   }
-  readonly;
-  hidden;
-  system;
-  isdir;
-  archive;
   ze->attr = 0;
 
 #ifdef ZIP_STD
@@ -4087,16 +4083,13 @@ ZRESULT EnsureDirectory(const TCHAR *rootdir, const TCHAR *dir) {
     c++;
   }
 
-  const TCHAR *name{lastslash};
   if (lastslash != dir) {
     TCHAR tmp[MAX_PATH];
     memcpy(tmp, dir, sizeof(TCHAR) * (lastslash - dir));
     tmp[lastslash - dir] = 0;
 
     ZRESULT rc = EnsureDirectory(rootdir, tmp);
     if (rc != ZR_OK) return rc;
-
-    name++;
   }
 
   TCHAR cd[MAX_PATH];
@@ -4488,6 +4481,9 @@ size_t FormatZipMessageU(ZRESULT code, TCHAR *buf, size_t len) {
     case ZR_FLATE:
       msg = _T("Zip-bug: an internal error during flation");
       break;
+    default:
+      // Use default one.
+      break;
   }
 
   const size_t mlen{_tcslen(msg)};

XZip.cpp

@@ -808,20 +808,20 @@ ZRESULT GetFileInfo(HANDLE hf, ulg *attr, long *size, iztimes *times,
 #endif
 // ----------------------------------------------------------------------
 
-void Assert(TState &state, bool cond, const char *msg) {
+[[maybe_unused]] void Assert(TState &state, bool cond, const char *msg) {
   if (cond) return;
   state.err = msg;
 }
-void Trace(const char *x, ...) {
+[[maybe_unused]] void Trace(const char *x, ...) {
   va_list paramList;
   va_start(paramList, x);
-  paramList;
+  // paramList;
   va_end(paramList);
 }
-void Tracec(bool, const char *x, ...) {
+[[maybe_unused]] void Tracec(bool, const char *x, ...) {
   va_list paramList;
   va_start(paramList, x);
-  paramList;
+  // paramList;
   va_end(paramList);
 }
 
@@ -2200,8 +2200,7 @@ ulg deflate(TState &state) {
 }
 
 // Write a local header described by *z to file *f. Return a ZE_ error code.
-int putlocal(struct zlist *z, WRITEFUNC wfunc,
-             void *param) {  
+int putlocal(struct zlist *z, WRITEFUNC wfunc, void *param) {
   PUTLG(LOCSIG, f);
   PUTSH(z->ver, f);
   PUTSH(z->lflg, f);
@@ -2408,20 +2407,20 @@ bool HasZipSuffix(const TCHAR *fn) {
 class TZip {
  public:
   explicit TZip(const char *pwd) noexcept
-      : hfout(nullptr),
+      : password(nullptr),
+        hfout(nullptr),
         mustclosehfout(false),
         hmapout(nullptr),
-        zfis(nullptr),
-        obuf(nullptr),
-        hfin(nullptr),
-        writ(0),
+        ooffset(0),
         oerr(ZR_OK),
+        writ(0),
+        obuf(nullptr),
         hasputcen(false),
-        ooffset(0),
         encwriting(false),
         encbuf(nullptr),
-        password(nullptr),
-        state(nullptr) {
+        zfis(nullptr),
+        state(nullptr),
+        hfin(nullptr) {
     memset(this, 0, sizeof(*this));
 
     if (pwd && *pwd) {
@@ -3490,6 +3489,9 @@ size_t FormatZipMessageZ(ZRESULT code, char *buf, size_t len) {
     case ZR_FLATE:
       msg = "Zip-bug: an internal error during flation";
       break;
+    default:
+      // Use default one.
+      break;
   }
 
   const size_t mlen{strlen(msg)};