Clean up includes. #306

minizip.c

@@ -11,12 +11,11 @@
    See the accompanying LICENSE file for the full text of the license.
 */
 
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 #include <time.h>
-#include <errno.h>
 
 #include "mz.h"
 #include "mz_os.h"
@@ -552,7 +551,7 @@ int main(int argc, const char *argv[])
                 options.legacy_encoding = 1;
             else if (((c == 'k') || (c == 'K')) && (i + 1 < argc))
             {
-                options.disk_size = atoi(argv[i + 1]) * 1024;
+                options.disk_size = (int64_t)atoi(argv[i + 1]) * 1024;
                 i += 1;
             }
             else if (((c == 'd') || (c == 'D')) && (i + 1 < argc))

mz_compat.c

@@ -125,8 +125,15 @@ zipFile ZEXPORT zipOpen_MZ(void *stream, int append, const char **globalcomment)
         mz_zip_get_comment(handle, globalcomment);
 
     compat = (mz_compat *)MZ_ALLOC(sizeof(mz_compat));
-    compat->handle = handle;
-    compat->stream = stream;
+    if (compat != NULL)
+    {
+        compat->handle = handle;
+        compat->stream = stream;
+    }
+    else
+    {
+        mz_zip_delete(&handle);
+    }
 
     return (zipFile)compat;
 }
@@ -401,10 +408,18 @@ unzFile ZEXPORT unzOpen_MZ(void *stream)
     }
 
     compat = (mz_compat *)MZ_ALLOC(sizeof(mz_compat));
-    compat->handle = handle;
-    compat->stream = stream;
+    if (compat != NULL)
+    {
+        compat->handle = handle;
+        compat->stream = stream;
+
+        mz_zip_goto_first_entry(compat->handle);
+    }
+    else
+    {
+        mz_zip_delete(&handle);
+    }
 
-    mz_zip_goto_first_entry(compat->handle);
     return (unzFile)compat;
 }
 

mz_strm_aes.c

@@ -11,7 +11,6 @@
 */
 
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

mz_strm_buf.c

@@ -11,11 +11,11 @@
    See the accompanying LICENSE file for the full text of the license.
 */
 
-
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
+#include <errno.h>
 
 #include "mz.h"
 #include "mz_strm.h"

mz_strm_bzip.c

@@ -10,7 +10,6 @@
 */
 
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>

mz_strm_lzma.c

@@ -10,7 +10,6 @@
 */
 
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>

mz_strm_mem.c

@@ -18,7 +18,6 @@
 */
 
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

mz_strm_pkcrypt.c

@@ -23,7 +23,6 @@
 */
 
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

mz_strm_posix.c

@@ -14,8 +14,8 @@
    See the accompanying LICENSE file for the full text of the license.
 */
 
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 

mz_strm_split.c

@@ -9,9 +9,8 @@
    See the accompanying LICENSE file for the full text of the license.
 */
 
-
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "mz.h"

mz_strm_zlib.c

@@ -10,7 +10,6 @@
 */
 
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>

mz_zip.c

@@ -16,13 +16,12 @@
    See the accompanying LICENSE file for the full text of the license.
 */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
-#include <errno.h>
 #include <limits.h>
 
 #include "mz.h"
@@ -263,7 +262,7 @@ static int32_t mz_zip_read_cd(void *handle)
         if ((err == MZ_OK) && (comment_size > 0))
         {
             zip->comment = (char *)MZ_ALLOC(comment_size + 1);
-            if (zip->comment)
+            if (zip->comment != NULL)
             {
                 if (mz_stream_read(zip->stream, zip->comment, comment_size) != comment_size)
                     err = MZ_STREAM_ERROR;

mz_zip_rw.c

@@ -11,8 +11,8 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 #include <time.h>
 
 #include "mz.h"