# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1588012409 -10800
# Node ID c1cae47cd4102aa2c53bcf49361011bdee685637
# Parent  0d13de7edb30bdd58cac25333cd12eb953550cc6
Rename DMPackEntry::length to csize (compressed size).

diff -r 0d13de7edb30 -r c1cae47cd410 src/dmpack.c
--- a/src/dmpack.c	Mon Apr 27 20:39:35 2020 +0300
+++ b/src/dmpack.c	Mon Apr 27 21:33:29 2020 +0300
@@ -150,7 +150,7 @@
 
         if (!dm_fread_str(pack->file, (Uint8 *) &entry->filename, DMRES_NAME_LEN) ||
             !dm_fread_le64(pack->file, &entry->offset) ||
-            !dm_fread_le32(pack->file, &entry->length) ||
+            !dm_fread_le32(pack->file, &entry->csize) ||
             !dm_fread_le32(pack->file, &entry->size) ||
             !dm_fread_le32(pack->file, &entry->flags))
         {
@@ -162,8 +162,8 @@
         entry->filename[DMRES_NAME_LEN] = 0;
 
         // Validate
-        if (entry->size == 0 || entry->length == 0 ||
-            entry->length > hdr.dirOffset ||
+        if (entry->size == 0 || entry->csize == 0 ||
+            entry->csize > hdr.dirOffset ||
             entry->offset > hdr.dirOffset ||
             strlen(entry->filename) == 0)
         {
diff -r 0d13de7edb30 -r c1cae47cd410 src/dmpack.h
--- a/src/dmpack.h	Mon Apr 27 20:39:35 2020 +0300
+++ b/src/dmpack.h	Mon Apr 27 21:33:29 2020 +0300
@@ -17,7 +17,7 @@
 {
     char    filename[DMRES_NAME_LEN + 1]; // +1 for NUL byte
     Uint64  offset;            // Offset in pack file
-    Uint32  length;            // Compressed data length
+    Uint32  csize;             // Compressed data size
     Uint32  size;              // Size of UNCOMPRESSED data
     Uint32  flags;             // Stored flags, see DMF_* in dmres.h
 
diff -r 0d13de7edb30 -r c1cae47cd410 src/dmres.c
--- a/src/dmres.c	Mon Apr 27 20:39:35 2020 +0300
+++ b/src/dmres.c	Mon Apr 27 21:33:29 2020 +0300
@@ -388,7 +388,7 @@
     memset(&zstr, 0, sizeof(zstr));
     zstr.next_out = handle->memData;
     zstr.avail_out = handle->memSize;
-    cdataLeft = node->length;
+    cdataLeft = node->csize;
 
     if ((zret = inflateInit(&zstr)) != Z_OK)
     {
@@ -430,14 +430,14 @@
     int ret;
 
     // Allocate buffer for compressed data
-    if ((inBuf = dmMalloc(node->length)) == NULL)
+    if ((inBuf = dmMalloc(node->csize)) == NULL)
     {
         ret = DMERR_MALLOC;
         goto out;
     }
 
     // Read compressed data
-    if (fread(inBuf, sizeof(Uint8), node->length, handle->lib->packFile->file) != node->length)
+    if (fread(inBuf, sizeof(Uint8), node->csize, handle->lib->packFile->file) != node->csize)
     {
         ret = DMERR_FREAD;
         goto out;
@@ -448,7 +448,7 @@
         goto out;
 
     zctx.inBuffer     = zctx.inBufferStart = inBuf;
-    zctx.inBufferEnd  = inBuf + node->length;
+    zctx.inBufferEnd  = inBuf + node->csize;
     zctx.outBuffer    = zctx.outBufferStart = handle->memData;
     zctx.outBufferEnd = handle->memData + node->size;
     zctx.expandable   = FALSE;
@@ -522,11 +522,11 @@
     }
     else
     {
-        if (node->size != node->length)
+        if (node->size != node->csize)
         {
             ret = dmErrorDBG(DMERR_INVALID_DATA,
                 "Node '%s' raw size and length fields differ for uncompressed node: %d <> %d.\n",
-                handle->filename, node->size, node->length);
+                handle->filename, node->size, node->csize);
             goto out;
         }
         if (fread(handle->memData, sizeof(Uint8), node->size, handle->lib->packFile->file) != node->size)
@@ -707,7 +707,7 @@
     // Check for EOF
     if (!dm_mem_realloc(ctx, ctx->memOffset + 1))
         return EOF;
-    
+
     ctx->memData[ctx->memOffset++] = ch;
     return ch;
 }
diff -r 0d13de7edb30 -r c1cae47cd410 tools/packed.c
--- a/tools/packed.c	Mon Apr 27 20:39:35 2020 +0300
+++ b/tools/packed.c	Mon Apr 27 21:33:29 2020 +0300
@@ -215,7 +215,7 @@
 
     node->size     = src->size;
     node->offset   = src->offset;
-    node->length   = src->length;
+    node->csize    = src->csize;
     node->flags    = src->flags;
 
     return node;
@@ -244,7 +244,7 @@
     for (node = pack->entries; node != NULL; node = node->next)
     {
         hdr.dirEntries++;
-        hdr.dirOffset += node->length;
+        hdr.dirOffset += node->csize;
     }
 
     dmMsg(1, "%d entries in PACK, dir at offset 0x%08" DM_PRIx64 ".\n",
@@ -269,7 +269,7 @@
         // Write one entry
         if (!dm_fwrite_str(pack->file, node->filename, DMRES_NAME_LEN) ||
             !dm_fwrite_le64(pack->file, node->offset) ||
-            !dm_fwrite_le32(pack->file, node->length) ||
+            !dm_fwrite_le32(pack->file, node->csize) ||
             !dm_fwrite_le32(pack->file, node->size) ||
             !dm_fwrite_le32(pack->file, node->flags))
             return DMERR_FWRITE;
@@ -326,7 +326,7 @@
     startOffs = sizeof(DMPackFileHeader);
     for (node = pack->entries; node != NULL; node = node->next)
     {
-        startOffs += node->length;
+        startOffs += node->csize;
     }
 
     // Seek to the position
@@ -404,7 +404,7 @@
     entry.filename[DMRES_NAME_LEN] = 0;
     entry.offset = startOffs;
     entry.size   = zstr.total_in;
-    entry.length = outSize;
+    entry.csize  = outSize;
     entry.flags  = flags | (compress ? DMF_COMPRESSED : 0);
 
     // Add directory entry
@@ -477,7 +477,7 @@
         zinit = TRUE;
     }
 
-    remaining = entry->length;
+    remaining = entry->csize;
     zret = Z_OK;
     while (remaining > 0 && zret == Z_OK)
     {
@@ -721,7 +721,7 @@
                 {
                     dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%" DM_PRId64 ", f=0x%04x]\n",
                         srcFilenames[i], node->filename,
-                        node->size, node->length, node->offset, node->flags);
+                        node->size, node->csize, node->offset, node->flags);
                 }
             }
 
@@ -768,7 +768,7 @@
                 if (match)
                 {
                     dmPrint(0, "%-32s | %8d | %8d | %08" DM_PRIx64 " | %04x\n",
-                        node->filename, node->size, node->length,
+                        node->filename, node->size, node->csize,
                         node->offset, node->flags);
                 }
             }
@@ -821,7 +821,7 @@
 
                     // Print one entry
                     dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08" DM_PRIx64 ", flags=0x%04x]\n",
-                            node->filename, node->size, node->length,
+                            node->filename, node->size, node->csize,
                             node->offset, node->flags);
 
                     dmPackExtractFile(pack, node, optDoCompress);