diff src/dmres.c @ 1046:7e54b2d08ce7

Add special debug error message function/macro that can be disabled and compiled out.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 01 Mar 2015 18:03:08 +0200
parents 1f37239172ad
children 509e6ed3a24e
line wrap: on
line diff
--- a/src/dmres.c	Sun Mar 01 17:47:50 2015 +0200
+++ b/src/dmres.c	Sun Mar 01 18:03:08 2015 +0200
@@ -354,7 +354,7 @@
 
     if (inflateInit(&zstr) != Z_OK)
     {
-        res = dmError(DMERR_INIT_FAIL,
+        res = dmErrorDBG(DMERR_INIT_FAIL,
             "Could not initialize zlib stream decompression.\n");
         goto out;
     }
@@ -445,7 +445,7 @@
     // Search PACK nodelist for file
     if ((node = dmPackFind(handle->lib->packFile->entries, handle->filename)) == NULL)
     {
-        ret = dmError(DMERR_NOT_FOUND,
+        ret = dmErrorDBG(DMERR_NOT_FOUND,
             "Entry '%s' not found in PACK file.\n",
             handle->filename);
         goto out;
@@ -454,7 +454,7 @@
     // Seek to entry
     if (DM_FSEEK64(handle->lib->packFile->file, node->offset, SEEK_SET) == -1)
     {
-        ret = dmError(DMERR_FSEEK,
+        ret = dmErrorDBG(DMERR_FSEEK,
             "Could not seek node position in PACK file.\n");
         goto out;
     }
@@ -462,7 +462,7 @@
     // Allocate memory for the node
     if ((handle->rawData = dmMalloc(node->size)) == NULL)
     {
-        ret = dmError(DMERR_MALLOC,
+        ret = dmErrorDBG(DMERR_MALLOC,
             "Failed to allocate node data for '%s' (%d bytes).\n",
             handle->filename, node->size);
         goto out;
@@ -476,7 +476,7 @@
 
         if (handle->rawSize != node->size)
         {
-            ret = dmError(DMERR_COMPRESSION,
+            ret = dmErrorDBG(DMERR_COMPRESSION,
                 "Decompressed data size for '%s' does not match size stored in PACK entry (%d <> %d).\n",
                 handle->filename, handle->rawSize, node->size);
         }
@@ -485,14 +485,14 @@
     {
         if (node->size != node->length)
         {
-            ret = dmError(DMERR_INVALID_DATA,
+            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);
             goto out;
         }
         if (fread(handle->rawData, sizeof(Uint8), node->size, handle->lib->packFile->file) != node->size)
         {
-            ret = dmError(DMERR_FREAD,
+            ret = dmErrorDBG(DMERR_FREAD,
                 "Error reading raw node data '%s', %d bytes.\n",
                 handle->filename, node->size);
             goto out;
@@ -999,7 +999,7 @@
             char *fname = dm_strdup_printf("%s/%s", path, dh->d_name);
             if (stat(fname, &sbuf) == -1)
             {
-                ret = dmError(dmGetErrno(),
+                ret = dmErrorDBG(dmGetErrno(),
                     "Could not stat() %s, #%d: %s\n",
                     fname, ret, dmErrorStr(ret));
                 dmFree(fname);
@@ -1061,14 +1061,14 @@
         {
             if ((flags & DRF_USE_STDIO) == 0)
             {
-                return dmError(DMERR_INIT_FAIL,
+                return dmErrorDBG(DMERR_INIT_FAIL,
                     "Error opening PACK file '%s', #%d: %s\n",
                     lib->packFilename, ret, dmErrorStr(ret));
             }
             else
             {
                 // Non-fatal
-                dmError(DMERR_INIT_FAIL,
+                dmErrorDBG(DMERR_INIT_FAIL,
                     "Failed to open PACK, falling back to STDIO, '%s' %d: %s\n",
                     lib->packFilename, ret, dmErrorStr(ret));
             }
@@ -1081,7 +1081,7 @@
                 DMResource *res = dmResourceNew(lib, node->filename, node->size, node->flags & DMF_PACK_MASK);
                 if (res == NULL)
                 {
-                    return dmError(DMERR_INIT_FAIL,
+                    return dmErrorDBG(DMERR_INIT_FAIL,
                         "Could not allocate memory for resource node '%s' [0x%08x], %d bytes.\n",
                         node->filename, node->flags, node->size);
                 }
@@ -1142,7 +1142,7 @@
         int ret = dmPackClose(lib->packFile);
         if (ret != DMERR_OK)
         {
-            dmError(ret, "Error closing PACK, #%i: %s\n",
+            dmErrorDBG(ret, "Error closing PACK, #%i: %s\n",
                 ret, dmErrorStr(ret));
         }
 
@@ -1195,7 +1195,7 @@
         // Attempt to preload the resource
         if ((ret = dmResourcePreload(lib->preload)) != DMERR_OK)
         {
-            dmError(ret, "Error preloading '%s', %d: %s\n",
+            dmErrorDBG(ret, "Error preloading '%s', %d: %s\n",
                 lib->preload->filename, ret, dmErrorStr(ret));
             goto error;
         }