# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1551776087 -7200
# Node ID f43011ea9b9f9e16aaed1f46ef9273093fd4541b
# Parent  6b2bac1e3445988a15aae3426815d980cc6be98a
Cleanups.

diff -r 6b2bac1e3445 -r f43011ea9b9f tools/gfxconv.c
--- a/tools/gfxconv.c	Tue Mar 05 10:32:28 2019 +0200
+++ b/tools/gfxconv.c	Tue Mar 05 10:54:47 2019 +0200
@@ -1894,7 +1894,7 @@
     DMImage *inImage = NULL, *outImage = NULL;
     Uint8 *dataBuf = NULL, *dataBufOrig = NULL;
     size_t dataSize, dataSizeOrig, dataRealOffs;
-    int i, n;
+    int i, n, res;
 
     // Default color mapping
     for (i = 0; i < C64_NCOLORS; i++)
@@ -1958,7 +1958,7 @@
     else
     if ((inFile = fopen(optInFilename, "rb")) == NULL)
     {
-        int res = dmGetErrno();
+        res = dmGetErrno();
         dmErrorMsg("Error opening input file '%s', %d: %s\n",
               optInFilename, res, dmErrorStr(res));
         goto error;
@@ -1985,8 +1985,11 @@
     // Read the input ..
     dmMsg(1, "Reading input from '%s'.\n", optInFilename);
 
-    if (dmReadDataFile(inFile, NULL, &dataBufOrig, &dataSizeOrig) != 0)
+    if ((res = dmReadDataFile(inFile, NULL, &dataBufOrig, &dataSizeOrig)) != DMERR_OK)
+    {
+        dmErrorMsg("Could not read input: %s.\n", dmErrorStr(res));
         goto error;
+    }
 
     fclose(inFile);
 
@@ -2031,7 +2034,6 @@
         // Probe for format
         const DMC64ImageFormat *forced = NULL;
         DMGrowBuf tbuf;
-        int res;
 
         if (optForcedInSubFormat >= 0)
         {
@@ -2117,70 +2119,64 @@
             break;
 
         case FFMT_BITMAP:
+            if (optOutFilename == NULL)
             {
-                int res = DMERR_OK;
+                dmErrorMsg("Output filename not set, required for bitmap formats.\n");
+                goto error;
+            }
 
-                if (optOutFilename == NULL)
-                {
-                    dmErrorMsg("Output filename not set, required for bitmap formats.\n");
-                    goto error;
-                }
+            switch (optOutType)
+            {
+                case FFMT_IMAGE:
+                case FFMT_CHAR:
+                case FFMT_SPRITE:
+                    res = dmC64ConvertBMP2Image(&outImage, inC64Image, inC64Fmt, &imageSpecC64);
 
-                switch (optOutType)
-                {
-                    case FFMT_IMAGE:
-                    case FFMT_CHAR:
-                    case FFMT_SPRITE:
-                        res = dmC64ConvertBMP2Image(&outImage, inC64Image, inC64Fmt, &imageSpecC64);
+                    if (res != DMERR_OK || outImage == NULL)
+                    {
+                        dmErrorMsg("Error in bitmap to image conversion.\n");
+                        goto error;
+                    }
 
-                        if (res != DMERR_OK || outImage == NULL)
-                        {
-                            dmErrorMsg("Error in bitmap to image conversion.\n");
-                            goto error;
-                        }
-
-                        switch (optOutType)
-                        {
-                            case FFMT_IMAGE:
-                                res = dmWriteImage(optOutFilename, outImage, &optSpec,
-                                    &dmImageFormatList[optOutFormat], TRUE);
-                                break;
+                    switch (optOutType)
+                    {
+                        case FFMT_IMAGE:
+                            res = dmWriteImage(optOutFilename, outImage, &optSpec,
+                                &dmImageFormatList[optOutFormat], TRUE);
+                            break;
 
-                            case FFMT_CHAR:
-                            case FFMT_SPRITE:
-                                res = dmWriteSpritesAndChars(optOutFilename, outImage,
-                                    optOutType, optInMulticolor);
-                                break;
-                        }
-                        break;
+                        case FFMT_CHAR:
+                        case FFMT_SPRITE:
+                            res = dmWriteSpritesAndChars(optOutFilename, outImage,
+                                optOutType, optInMulticolor);
+                            break;
+                    }
+                    break;
 
-                    case FFMT_BITMAP:
-                        if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image,
-                            &dmC64ImageFormats[optOutFormat], inC64Fmt)) != DMERR_OK)
-                        {
-                            dmErrorMsg("Error in bitmap format conversion.\n");
-                            goto error;
-                        }
-                        if (dmVerbosity >= 2)
-                        {
-                            dmPrint(0, "INPUT:\n");  dmC64ImageDump(stderr, inC64Image, inC64Fmt, "  ");
-                            dmPrint(0, "OUTPUT:\n"); dmC64ImageDump(stderr, outC64Image, &dmC64ImageFormats[optOutFormat], "  ");
-                        }
-                        res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutFormat]);
-                        break;
+                case FFMT_BITMAP:
+                    if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image,
+                        &dmC64ImageFormats[optOutFormat], inC64Fmt)) != DMERR_OK)
+                    {
+                        dmErrorMsg("Error in bitmap format conversion.\n");
+                        goto error;
+                    }
+                    if (dmVerbosity >= 2)
+                    {
+                        dmPrint(0, "INPUT:\n");  dmC64ImageDump(stderr, inC64Image, inC64Fmt, "  ");
+                        dmPrint(0, "OUTPUT:\n"); dmC64ImageDump(stderr, outC64Image, &dmC64ImageFormats[optOutFormat], "  ");
+                    }
+                    res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutFormat]);
+                    break;
 
-                    default:
-                        dmErrorMsg("Unsupported output format for bitmap conversion.\n");
-                        break;
-                }
-
+                default:
+                    dmErrorMsg("Unsupported output format for bitmap conversion.\n");
+                    break;
             }
             break;
 
         case FFMT_IMAGE:
             {
                 const DMImageFormat *ifmt = &dmImageFormatList[optInFormat];
-                int res = DMERR_OK;
                 DMResource *fp;
 
                 if (optOutFilename == NULL)