dmlib: tools/64vw.c comparison

comparison tools/64vw.c @ 2565:d56a0e86067a

Improve error handling.

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

comparison

equal deleted inserted replaced

-:2cf4e995b50c
+:d56a0e86067a
 size_t dataSize;
 DMGrowBuf tmp;
 int ret;
 if ((ret = dmReadDataFile(NULL, filename, &dataBuf, &dataSize)) != DMERR_OK)
-goto exit;
+goto out;
 dmGrowBufConstCreateFrom(&tmp, dataBuf, dataSize);
 if (optProbeOnly)
 ret = dmC64ProbeBMP(&tmp, fmt) != DM_PROBE_SCORE_FALSE ? DMERR_OK : DMERR_NOT_SUPPORTED;
 else
 ret = dmC64DecodeBMP(cimage, &tmp, -1, -1, fmt, forced);
-exit:
+out:
 dmFree(dataBuf);
 return ret;
 }
 SDL_Texture *texture = NULL;
 SDL_Surface *surf = NULL;
 DMImage *bimage = NULL;
 BOOL initSDL = FALSE, exitFlag, needRedraw;
 size_t currIndex, prevIndex;
-int res;
+int res = DMERR_OK;
 // Initialize pre-requisites
 if ((res = dmLib64GFXInit()) != DMERR_OK)
 {
 dmErrorMsg("Could not initialize lib64gfx: %s\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 dmSetScaleFactor(2.0);
 memset(&optSpec, 0, sizeof(optSpec));
 memset(&setCharROM, 0, sizeof(setCharROM));
 dmInitProg("64vw", "Displayer for various C64 graphics formats", "0.4", NULL, NULL);
 // Parse arguments, round #1
 if (!dmArgsProcess(argc, argv, optList, optListN,
 argHandleOpt, argHandleFile1, OPTH_BAILOUT))
-exit(1);
+goto out;
 if (noptFilenames1 == 0)
 {
-dmErrorMsg("No input file(s) specified, perhaps you need some --help\n");
+argShowHelp();
-goto exit;
+res = dmError(DMERR_INVALID_ARGS,
+"No input file(s) specified.\n");
+goto out;
 }
 // Allocate space for filename pointers
 if ((optFilenames = dmCalloc(noptFilenames1, sizeof(char *))) == NULL)
 {
 dmErrorMsg("Could not allocate memory for input file list.\n");
-goto exit;
+goto out;
 }
 // Assign the filename pointers
 if (!dmArgsProcess(argc, argv, optList, optListN,
 NULL, argHandleFile2, OPTH_BAILOUT | OPTH_ONLY_OTHER))
-goto exit;
+goto out;
 // Check for forced input format
 if (optForcedFormat >= 0)
 {
 forced = &dmC64ImageFormats[optForcedFormat];
 dmC64ImageDump(stdout, cimage, fmt, "  ");
 }
 dmC64ImageFree(cimage);
 }
-goto exit;
+goto out;
 }
 if (optC64PaletteFile != NULL)
 {
 if ((res = dmHandleExternalPalette(optC64PaletteFile, &optSpec.pal)) != DMERR_OK)
-goto exit;
+goto out;
 if (optSpec.pal->ncolors < D64_NCOLORS)
 {
 dmErrorMsg("Palette does not have enough colors (%d < %d)\n",
 optSpec.pal->ncolors, D64_NCOLORS);
-goto exit;
+goto out;
 }
 }
 else
 {
 // No palette file specified, use internal palette
 if ((res = dmC64PaletteFromC64Palette(&optSpec.pal, optC64Palette, FALSE)) != DMERR_OK)
 {
 dmErrorMsg("Could not setup palette: %s\n",
 dmErrorStr(res));
-goto exit;
+goto out;
 }
 }
 // Check character ROM filename
 if (optCharROMFilename == NULL)
 // Initialize libSDL
 if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0)
 {
 dmErrorMsg("Could not initialize SDL: %s\n", SDL_GetError());
-goto exit;
+goto out;
 }
 initSDL = TRUE;
 // Open window
 if ((window = SDL_CreateWindow(dmProgName,
 optVFlags | SDL_WINDOW_RESIZABLE
 //| SDL_WINDOW_HIDDEN
 )) == NULL)
 {
 dmErrorMsg("Can't create an SDL window: %s\n", SDL_GetError());
-goto exit;
+goto out;
 }
 if ((renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_PRESENTVSYNC)) == NULL)
 {
 dmErrorMsg("Can't create an SDL renderer: %s\n", SDL_GetError());
-goto exit;
+goto out;
 }
 //    SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "best");
 // Start main loop
 break;
 case SDLK_f:
 optVFlags ^= SDL_WINDOW_FULLSCREEN_DESKTOP;
 if (SDL_SetWindowFullscreen(window, optVFlags) != 0)
-goto exit;
+goto out;
 break;
 default:
 break;
 }
 break;
 }
 break;
 case SDL_QUIT:
-goto exit;
+goto out;
 }
 if (currIndex != prevIndex)
 {
 char *filename = optFilenames[currIndex];
 if (surf == NULL && (surf = SDL_CreateRGBSurfaceWithFormat(0,
 D64_SCR_WIDTH, D64_SCR_HEIGHT, 8, SDL_PIXELFORMAT_INDEX8)) == NULL)
 {
 dmErrorMsg("Could not allocate surface.\n");
-goto exit;
+goto out;
 }
 if (texture != NULL)
 SDL_DestroyTexture(texture);
 if ((texture = SDL_CreateTextureFromSurface(renderer, surf)) == NULL)
 {
 dmErrorMsg("Could not create texture from surface: %s\n", SDL_GetError());
-goto exit;
+goto out;
 }
 if (title == NULL)
 {
 title = dm_strdup_printf("%s - [%d / %d] %s",
 }
 SDL_Delay(50);
 }
-exit:
+out:
 // Cleanup
 dmFree(optFilenames);
 dmC64MemBlockFree(&setCharROM);
 if (texture != NULL)
 dmImageFree(bimage);
 dmPaletteFree(optSpec.pal);
 dmLib64GFXClose();
-return 0;
+return res;
 }

Mercurial > hg > dmlib

comparison tools/64vw.c @ 2565:d56a0e86067a