Mercurial > hg > dmlib

changeset 2387:68efae89c034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up some error messages in gfxconv.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 09 Jan 2020 19:59:00 +0200
parents f543475ea0eb
children 2dbbc1c91231
files tools/gfxconv.c
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/tools/gfxconv.c	Thu Jan 09 18:52:09 2020 +0200
+++ b/tools/gfxconv.c	Thu Jan 09 19:59:00 2020 +0200
@@ -552,8 +552,8 @@
     if ((fp = fopen(filename, "r")) == NULL)
     {
         res = dmGetErrno();
-        dmError(res, "Could not open color remap file '%s' for reading, %d: %s\n",
-            res, dmErrorStr(res));
+        dmError(res, "Could not open color remap file '%s' for reading: %s.\n",
+            dmErrorStr(res));
         return res;
     }
 
@@ -1706,8 +1706,8 @@
     if ((outFile = fopen(filename, "wb")) == NULL)
     {
         ret = dmGetErrno();
-        dmErrorMsg("Could not open '%s' for writing, %d: %s.\n",
-            filename, ret, dmErrorStr(ret));
+        dmErrorMsg("Could not open '%s' for writing: %s.\n",
+            filename, dmErrorStr(ret));
         goto error;
     }
 
@@ -1751,8 +1751,8 @@
         if (!dm_fwrite_str(outFile, tmpBuf, outBufSize))
         {
             ret = dmGetErrno();
-            dmError(ret, "Error writing data block %d,%d to '%s', %d: %s\n",
-                bx, by, filename, ret, dmErrorStr(ret));
+            dmError(ret, "Error writing data block %d,%d to '%s': %s.\n",
+                bx, by, filename, dmErrorStr(ret));
             goto error;
         }
     }
@@ -1808,7 +1808,7 @@
         if ((outFile = fopen(optOutFilename, "w")) == NULL)
         {
             ret = dmGetErrno();
-            dmError(ret, "Error opening output file '%s': %s\n",
+            dmError(ret, "Error opening output file '%s': %s.\n",
                   optOutFilename, dmErrorStr(ret));
             goto error;
         }
@@ -2031,8 +2031,8 @@
     if ((inFile = fopen(optInFilename, "rb")) == NULL)
     {
         res = dmGetErrno();
-        dmErrorMsg("Error opening input file '%s', %d: %s\n",
-              optInFilename, res, dmErrorStr(res));
+        dmErrorMsg("Error opening input file '%s': %s\n",
+              optInFilename, dmErrorStr(res));
         goto exit;
     }
 
@@ -2211,7 +2211,7 @@
 
         if ((res = dmC64PaletteFromC64Palette(&optC64Spec.pal, optC64Palette, FALSE)) != DMERR_OK)
         {
-            dmErrorMsg("Could not setup palette: %s\n",
+            dmErrorMsg("Could not setup palette: %s.\n",
                 dmErrorStr(res));
             goto exit;
         }
@@ -2263,7 +2263,7 @@
 
                     if (res != DMERR_OK || outImage == NULL)
                     {
-                        dmErrorMsg("Error in bitmap to image conversion: %s\n",
+                        dmErrorMsg("Error in bitmap to image conversion: %s.\n",
                             dmErrorStr(res));
                         goto exit;
                     }
@@ -2358,7 +2358,7 @@
                             if (res != DMERR_OK || tmpC64Image == NULL)
                             {
                                 dmC64ImageFree(tmpC64Image);
-                                dmErrorMsg("Error in image to bitmap conversion: %s\n",
+                                dmErrorMsg("Error in image to bitmap conversion: %s.\n",
                                     dmErrorStr(res));
                                 goto exit;
                             }
@@ -2367,7 +2367,7 @@
                                 &dmC64ImageFormats[optOutFormat], &dmC64ImageFormats[optOutFormat])) != DMERR_OK)
                             {
                                 dmC64ImageFree(tmpC64Image);
-                                dmErrorMsg("Error in bitmap format conversion: %s\n",
+                                dmErrorMsg("Error in bitmap format conversion: %s.\n",
                                     dmErrorStr(res));
                                 goto exit;
                             }