changeset 1018:782a2a3a3707

Cosmetic.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 01 Mar 2015 04:56:00 +0200
parents 6436d80ae0fc
children 8cf8a8035438
files tools/packed.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tools/packed.c	Sun Mar 01 04:47:43 2015 +0200
+++ b/tools/packed.c	Sun Mar 01 04:56:00 2015 +0200
@@ -339,12 +339,11 @@
     // Create directory entry
     strncpy(entry.filename, filename, sizeof(entry.filename));
     entry.filename[sizeof(entry.filename) - 1] = 0;
+    entry.offset = startOffs;
     entry.size   = zstr.total_in;
-    entry.offset = startOffs;
     entry.length = zstrSize;
     entry.flags  = flags;
 
-
     // Add directory entry
     if ((*ppEntry = dmPackEntryCopy(&entry)) == NULL)
     {
@@ -380,7 +379,7 @@
     int ret;
 
     if (pack == NULL)
-        return DMERR_OK;
+        return DMERR_NULLPTR;
 
     if (pack->file == NULL)
         return DMERR_FOPEN;
@@ -430,7 +429,7 @@
         else
             zstr.avail_in = fread(inBuffer, sizeof(Uint8), inDataLeft, pack->file);
 
-        inDataLeft -= zstr.avail_in;
+        remaining   -= zstr.avail_in;
         zstr.next_in = inBuffer;
 
         while (zstr.avail_in > 0 && ret == Z_OK)