Tune cflags and fix some warnings

2 files changed, 7 insertions, 8 deletions

diff --git a/zip/Makefile b/zip/Makefile
index 59a2534..eb45047 100644
--- a/zip/Makefile
+++ b/zip/Makefile
@@ -8,7 +8,7 @@ DIR_ZIPARCHIVE = ./ZipArchive/
 CC = gcc
 CPP = g++
 CFLAGS = -I. -I$(DIR_ZIPARCHIVE) -I/usr/include \
-	 -Wall -fPIC -O2 -g \
+	 -Wall -Wtype-limits -fPIC -O2 -g -ggdb \
 	 -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
 	 -D__VERBOSE_DEBUGx
 
diff --git a/zip/zip.cpp b/zip/zip.cpp
index 577941f..adedfbc 100644
--- a/zip/zip.cpp
+++ b/zip/zip.cpp
@@ -112,7 +112,6 @@ get_vfs_errorcode (int m_iCause)
 //    case CZipException::bzInternalError: return cVFS_ReadErr;   //  Internal Bzlib library error.    	
     default: return cVFS_WriteErr;
   }    
-  return cVFS_Failed;  //  Default error
 }
 
 
@@ -611,7 +610,7 @@ TVFSResult
 VFSRemove (struct TVFSGlobs *globs, const char *APath)
 {
   char *AFile, *AFile1, *AFile2, *AFile3;
-  unsigned long int file_no;
+  long int file_no;
   
   
   printf ("(II) VFSRemove: Going to remove the file '%s'...\n", APath);
@@ -675,7 +674,7 @@ VFSRename (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName)
 {
   char *AFile;
   char *ADestFile;
-  unsigned long int file_no;
+  long int file_no;
 
   printf ("(II) VFSRename: Going to rename/move the file '%s' to '%s'...\n", sSrcName, sDstName);
 
@@ -726,7 +725,7 @@ TVFSResult
 VFSChmod (struct TVFSGlobs *globs, const char *FileName, guint32 Mode)
 {
   char *AFile;
-  unsigned long int file_no;
+  long int file_no;
   CZipFileHeader *header;
 
   printf ("(II) VFSChmod: Going to change permissions of the file '%s'...\n", FileName);
@@ -767,7 +766,7 @@ VFSChmod (struct TVFSGlobs *globs, const char *FileName, guint32 Mode)
       globs->zip->SetFileHeaderAttr (*header, (header->GetSystemAttr() & 0xFFFFF000) + (Mode & 0xFFF));
 
       /*  write local header information  */
-      globs->zip->OverwriteLocalHeader (file_no);      
+      globs->zip->OverwriteLocalHeader (file_no);
 
 #if 0      
       //  Re-encrypt the file
@@ -812,7 +811,7 @@ TVFSResult
 VFSChangeTimes (struct TVFSGlobs *globs, const char *APath, guint32 mtime, guint32 atime)
 {
   char *AFile;
-  unsigned long int file_no;
+  long int file_no;
   CZipFileHeader *header;
 
   printf ("(II) VFSChangeTimes: Going to change date/times of the file '%s'...\n", APath);
@@ -935,7 +934,7 @@ TVFSResult
 VFSCopyToLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append)
 {
   gboolean try_again;
-  unsigned long int file_no;
+  long int file_no;
   char *s;
   char *dest_path;
   char *dest_filename;