dmlib: tools/gfxconv.c comparison

comparison tools/gfxconv.c @ 2565:d56a0e86067a

Improve error handling.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 28 Feb 2022 11:49:58 +0200
parents	acaf678a2129
children	d75431bf1a7d

comparison

equal deleted inserted replaced

-:2cf4e995b50c
+:d56a0e86067a
 DMConvFormat inFormat, outFormat;
 DMC64Image *inC64Image = NULL, *outC64Image = NULL;
 DMImage *inImage = NULL, *outImage = NULL;
 Uint8 *dataBuf = NULL, *dataBufOrig = NULL;
 size_t dataSize, dataSizeOrig, dataRealOffs;
-int i, n, res;
+int i, n, res = DMERR_OK;
 // Default color mapping
 for (i = 0; i < D64_NCOLORS; i++)
 optColorMap[i] = i;
 // Initialize list of additional conversion formats
 if ((res = dmLib64GFXInit()) != DMERR_OK)
 {
 dmErrorMsg("Could not initialize lib64gfx: %s\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 nconvFormatList = ndmImageFormatList + ndmPaletteFormatList + nbaseFormatList;
 convFormatList = dmCalloc(nconvFormatList, sizeof(DMConvFormat));
 // Initialize and parse commandline
 dmInitProg("gfxconv", "Simple graphics converter", "0.95", NULL, NULL);
 if (!dmArgsProcess(argc, argv, optList, optListN,
 argHandleOpt, argHandleFile, OPTH_BAILOUT))
-exit(1);
+goto out;
 switch (optShowHelp)
 {
 case 1:
 argShowHelp();
-exit(0);
+goto out;
-break;
 case 2:
 argShowHelp();
 argShowFormats();
 argShowC64Formats(stdout, TRUE, TRUE);
 {
 const char *str = argGetHelpTopic(optList[n].id);
 if (str != NULL)
 fprintf(stdout, "\n%s\n", str);
 }
-exit(0);
+goto out;
-break;
 case 3:
 argShowFormats();
 argShowC64Formats(stdout, TRUE, dmVerbosity > 0);
-exit(0);
+goto out;
-break;
 }
 // Determine input format, if not specified
 if (optInType == FFMT_AUTO && optInFilename != NULL)
 {
 {
 if (optInType == FFMT_AUTO)
 {
 dmErrorMsg("Standard input cannot be used without specifying input format.\n");
 dmErrorMsg("Perhaps you should try --help or --longhelp\n");
-goto exit;
+goto out;
 }
 inFile = stdin;
 optInFilename = "stdin";
 }
 else
 if ((inFile = fopen(optInFilename, "rb")) == NULL)
 {
 res = dmGetErrno();
 dmErrorMsg("Error opening input file '%s': %s\n",
 optInFilename, dmErrorStr(res));
-goto exit;
+goto out;
 }
 // Determine output format, if not specified
 if (optOutType == FFMT_AUTO && optOutFilename != NULL)
 {
 dmMsg(1, "Reading input from '%s'.\n", optInFilename);
 if ((res = dmReadDataFile(inFile, NULL, &dataBufOrig, &dataSizeOrig)) != DMERR_OK)
 {
 dmErrorMsg("Could not read input: %s.\n", dmErrorStr(res));
-goto exit;
+goto out;
 }
 fclose(inFile);
 // Check and compute the input skip
 if (optInSkip > dataSizeOrig)
 {
 dmErrorMsg("Input skip value %d (0x%x) is larger than input size %" DM_PRIu_SIZE_T ".\n",
 optInSkip, optInSkip, dataSizeOrig);
-goto exit;
+goto out;
 }
 if (optInSkipNeg)
 {
 dataBuf = dataBufOrig + dataSizeOrig - optInSkip;
 }
 else
 if (res != DMERR_OK && (forced != NULL || optInType == FFMT_BITMAP))
 {
 dmErrorMsg("Could not decode input image: %s.\n", dmErrorStr(res));
-goto exit;
+goto out;
 }
 }
 if (optInType == FFMT_AUTO || optInType == FFMT_IMAGE)
 {
 }
 if (optInType == FFMT_AUTO)
 {
 dmErrorMsg("No input format specified, and could not be determined automatically.\n");
-goto exit;
+goto out;
 }
 if (dmGetConvFormat(optInType, optInFormat, &inFormat) &&
 dmGetConvFormat(optOutType, optOutFormat, &outFormat))
 {
 }
 // Handle palette stuff that is generic for different operation modes
 if (optPaletteFile != NULL &&
 (res = dmHandleExternalPalette(optPaletteFile, &optPaletteData)) != DMERR_OK)
-goto exit;
+goto out;
 switch (optInType)
 {
 case FFMT_SPRITE:
 case FFMT_CHAR:
 if ((res = dmC64PaletteFromC64Palette(&optPaletteData, optC64Palette, FALSE)) != DMERR_OK)
 {
 dmErrorMsg("Could not set up palette: %s.\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 }
 if (optPaletteData->ncolors < D64_NCOLORS)
 {
 dmErrorMsg("Palette does not have enough colors (%d < %d)\n",
 optPaletteData->ncolors, D64_NCOLORS);
-goto exit;
+goto out;
 }
 if (optPaletteData->ncolors > D64_NCOLORS)
 {
 dmMsg(1, "Palette has %d colors, using only first %d.\n",
 if ((res = dmC64PaletteFromC64Palette(&optPaletteData, optC64Palette, FALSE)) != DMERR_OK)
 {
 dmErrorMsg("Could not set up palette: %s.\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 }
 }
 switch (optInType)
 DMResource *fp;
 if (optOutFilename == NULL)
 {
 dmErrorMsg("Output filename not set, required for palette formats.\n");
-goto exit;
+goto out;
 }
 // Read palette file
 if ((res = dmf_open_memio(NULL, optInFilename, dataBuf, dataSize, &fp)) != DMERR_OK)
 {
 dmErrorMsg("Could not create MemIO handle for input.\n");
-goto exit;
+goto out;
 }
 // Read input
 if (pfmt->read != NULL)
 res = pfmt->read(fp, &optPaletteData);
 dmf_close(fp);
 if (res != DMERR_OK)
 {
 dmErrorMsg("Palette could not be read.\n");
-goto exit;
+goto out;
 }
 }
 if (optPaletteData == NULL)
-goto exit;
+goto out;
 switch (optOutType)
 {
 case FFMT_PALETTE:
 res = dmWritePalette(optOutFilename, optPaletteData, &dmPaletteFormatList[optOutFormat]);
 if ((inImage = dmImageAlloc(16, 16, DM_PIXFMT_PALETTE,
 dmGetNPlanesFromNColors(optPaletteData->ncolors))) == NULL)
 {
 res = dmError(DMERR_MALLOC,
 "Could not allocate memory for image.\n");
-goto exit;
+goto out;
 }
 if ((res = dmPaletteCopy(&inImage->pal, optPaletteData)) != DMERR_OK)
 {
 dmErrorMsg("Could not allocate image palette: %s\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 res = dmWriteImage(optOutFilename, inImage, &optSpec,
 &dmImageFormatList[optOutFormat]);
 break;
 case FFMT_BITMAP:
 if (optOutFilename == NULL)
 {
 dmErrorMsg("Output filename not set, required for bitmap formats.\n");
-goto exit;
+goto out;
 }
 switch (optOutType)
 {
 case FFMT_IMAGE:
 &inC64Image->charData[0].data,
 &inC64Image->charData[0].size)) != DMERR_OK)
 {
 dmErrorMsg("Could not read character ROM from '%s'.\n",
 optCharROMFilename);
-goto exit;
+goto out;
 }
 }
 // Convert the image
 res = dmC64ConvertBMP2Image(&outImage, inC64Image, &optC64Spec);
 if (res != DMERR_OK || outImage == NULL)
 {
 dmErrorMsg("Error in bitmap to image conversion: %s.\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 switch (optOutType)
 {
 case FFMT_IMAGE:
 case FFMT_BITMAP:
 if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image,
 &dmC64ImageFormats[optOutFormat], inC64Fmt)) != DMERR_OK)
 {
 dmErrorMsg("Error in bitmap format conversion.\n");
-goto exit;
+goto out;
 }
 if (dmVerbosity >= 2)
 {
 dmPrint(0, "INPUT:\n");  dmC64ImageDump(stderr, inC64Image, inC64Fmt, "  ");
 dmPrint(0, "OUTPUT:\n"); dmC64ImageDump(stderr, outC64Image, &dmC64ImageFormats[optOutFormat], "  ");
 DMResource *fp;
 if (optOutFilename == NULL)
 {
 dmErrorMsg("Output filename not set, required for image formats.\n");
-goto exit;
+goto out;
 }
 if ((res = dmf_open_memio(NULL, optInFilename, dataBuf, dataSize, &fp)) != DMERR_OK)
 {
 dmErrorMsg("Could not create MemIO handle for input.\n");
-goto exit;
+goto out;
 }
 // Read input
 if (ifmt->read != NULL)
 res = ifmt->read(fp, &inImage);
 dmErrorMsg("Unsupported input image format for image conversion.\n");
 dmf_close(fp);
 if (res != DMERR_OK || inImage == NULL)
-goto exit;
+goto out;
 switch (optOutType)
 {
 case FFMT_IMAGE:
 res = dmWriteImage(optOutFilename, inImage, &optSpec,
 case FFMT_PALETTE:
 if (inImage->pal == NULL || inImage->pixfmt != DM_PIXFMT_PALETTE)
 {
 dmErrorMsg("Source image is not a paletted format or has no palette.\n");
-goto exit;
+goto out;
 }
 res = dmWritePalette(optOutFilename, inImage->pal, &dmPaletteFormatList[optOutFormat]);
 break;
 case FFMT_CHAR:
 if (res != DMERR_OK || tmpC64Image == NULL)
 {
 dmC64ImageFree(tmpC64Image);
 dmErrorMsg("Error in image to bitmap conversion: %s.\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 if ((res = dmConvertC64Bitmap(&outC64Image, tmpC64Image,
 &dmC64ImageFormats[optOutFormat], &dmC64ImageFormats[optOutFormat])) != DMERR_OK)
 {
 dmC64ImageFree(tmpC64Image);
 dmErrorMsg("Error in bitmap format conversion: %s.\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutFormat]);
 dmC64ImageFree(tmpC64Image);
 }
 {
 dmErrorMsg("Error writing output data: %s\n",
 dmErrorStr(res));
 }
-exit:
+out:
 // Cleanup
 dmFree(convFormatList);
 dmFree(dataBufOrig);
 dmPaletteFree(optPaletteData);
 dmC64ImageFree(inC64Image);
 dmC64ImageFree(outC64Image);
 dmImageFree(inImage);
 dmImageFree(outImage);
 dmLib64GFXClose();
-return 0;
+return res;
 }

Mercurial > hg > dmlib

comparison tools/gfxconv.c @ 2565:d56a0e86067a