changeset 2105:eebe338b3c39

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 29 Apr 2019 14:09:01 +0300
parents 1edf494226c6
children 78a0f44aa8b5
files tools/packed.c
diffstat 1 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tools/packed.c	Mon Apr 29 13:46:50 2019 +0300
+++ b/tools/packed.c	Mon Apr 29 14:09:01 2019 +0300
@@ -229,12 +229,10 @@
         sizeof(hdr.ident) + sizeof(hdr.version) +
         sizeof(hdr.dirEntries) + sizeof(hdr.dirOffset);
 
-    node = pack->entries;
-    while (node != NULL)
+    for (node = pack->entries; node != NULL; node = node->next)
     {
         hdr.dirEntries++;
         hdr.dirOffset += node->length;
-        node = node->next;
     }
 
     dmMsg(1, "%d entries in PACK, dir at offset 0x%08x.\n",
@@ -254,8 +252,7 @@
     if (fseeko(pack->file, hdr.dirOffset, SEEK_SET) != 0)
         return DMERR_FSEEK;
 
-    node = pack->entries;
-    while (node != NULL)
+    for (node = pack->entries; node != NULL; node = node->next)
     {
         // Write one entry
         if (!dm_fwrite_str(pack->file, node->filename, DMRES_NAME_LEN) ||
@@ -264,8 +261,6 @@
             !dm_fwrite_le32(pack->file, node->size) ||
             !dm_fwrite_le32(pack->file, node->flags))
             return DMERR_FWRITE;
-
-        node = node->next;
     }
 
     return DMERR_OK;
@@ -317,11 +312,9 @@
     // Compute starting offset
     outSize = 0;
     startOffs = sizeof(DMPackFileHeader);
-    node = pack->entries;
-    while (node != NULL)
+    for (node = pack->entries; node != NULL; node = node->next)
     {
         startOffs += node->length;
-        node = node->next;
     }
 
     // Seek to the position