Mercurial > hg > dmlib

changeset 314:e9c6aee5d2f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve output.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 13 Oct 2012 07:19:22 +0300
parents a89500f26dde
children ec70ae5aaa1a
files packed.c
diffstat 1 files changed, 20 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/packed.c	Fri Oct 12 13:45:33 2012 +0300
+++ b/packed.c	Sat Oct 13 07:19:22 2012 +0300
@@ -130,7 +130,7 @@
     }
     else
     {
-        dmError("Maximum number of input files (%i) exceeded!\n",
+        dmError("Maximum number of input files (%d) exceeded!\n",
               SET_MAX_FILES);
         return FALSE;
     }
@@ -257,15 +257,17 @@
 
     if (res != DMERR_OK)
     {
-        dmPrint(1, "%-32s [ERROR:%i]\n",
+        dmPrint(1, "%-32s [ERROR:%d]\n",
             filename, res);
     }
     else
     {
-        dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%ld, f=0x%04x]\n",
+        char tmp[16];
+        dmres_flags_to_symbolic(tmp, sizeof(tmp), node->resFlags);
+        dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%ld, f=%s]\n",
             filename, node->filename,
             node->size, node->length, node->offset,
-            node->resFlags);
+            tmp);
     }
 
     return res;
@@ -338,12 +340,12 @@
                 }
             }
 
-            dmMsg(1, "w=%i\n", dm_pack_write(pack));
-            dmMsg(1, "c=%i\n", dm_pack_close(pack));
+            dmMsg(1, "w=%d\n", dm_pack_write(pack));
+            dmMsg(1, "c=%d\n", dm_pack_close(pack));
         }
         else
         {
-            dmError("Could not open packfile, error #%i: %s\n", res,
+            dmError("Could not open packfile, error #%d: %s\n", res,
                   dmErrorStr(res));
         }
         break;
@@ -388,10 +390,10 @@
                 }
             }
 
-            dmMsg(1, "c=%i\n", dm_pack_close(pack));
+            dmMsg(1, "c=%d\n", dm_pack_close(pack));
         }
         else
-            dmError("Could not open packfile, error #%i: %s\n", res,
+            dmError("Could not open packfile, error #%d: %s\n", res,
                   dmErrorStr(res));
         break;
 
@@ -404,7 +406,7 @@
             FILE *resFile = fopen(DMRES_RES_FILE, "w");
             if (resFile == NULL)
             {
-                dmError("Could not create resource output file '%s' #%i: %s\n",
+                dmError("Could not create resource output file '%s' #%d: %s\n",
                     DMRES_RES_FILE, errno, strerror(errno));
             }
 
@@ -426,31 +428,34 @@
 
                 if (match && (node->privFlags & PACK_EXTRACTED) == 0)
                 {
+                    char tmp[16];
+
                     // Mark as done
                     node->privFlags |= PACK_EXTRACTED;
 
                     // Print one entry
-                    dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08x, flags=0x%04x]\n",
+                    dmres_flags_to_symbolic(tmp, sizeof(tmp), node->resFlags);
+                    dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08x, flags=%s]\n",
                             node->filename, node->size, node->length,
-                            node->offset, node->resFlags);
+                            node->offset, tmp);
 
                     dm_pack_extract_file(pack, node);
                     
                     if (resFile != NULL)
                     {
                         fprintf(resFile,
-                        "%s|%04x", node->filename, node->resFlags);
+                        "%s|%s", node->filename, tmp);
                     }
                 }
             }
 
-            dmMsg(1, "c=%i\n", dm_pack_close(pack));
+            dmMsg(1, "c=%d\n", dm_pack_close(pack));
             
             if (resFile != NULL)
                 fclose(resFile);
         }
         else
-            dmError("Could not open packfile, error #%i: %s\n", res,
+            dmError("Could not open packfile, error #%d: %s\n", res,
                   dmErrorStr(res));
         break;