# HG changeset patch # User Matti Hamalainen # Date 1509842316 -7200 # Node ID c29f1cea4a1cd8daf6ffc559aec5eb5d43d8c35b # Parent a515d42c04e7dd27fa1ecb3d40b54912cad1f677 Rename a label. diff -r a515d42c04e7 -r c29f1cea4a1c tools/view64.c --- a/tools/view64.c Sun Nov 05 02:36:26 2017 +0200 +++ b/tools/view64.c Sun Nov 05 02:38:36 2017 +0200 @@ -226,12 +226,12 @@ if (optFilename == NULL) { dmErrorMsg("No input file specified, perhaps you need some --help\n"); - goto error; + goto exit; } dmPrint(1, "\n%s\n", optFilename); if ((ret = dmReadDataFile(NULL, optFilename, &dataBuf, &dataSize)) != DMERR_OK) - goto error; + goto exit; // Probe for format @@ -249,25 +249,25 @@ if (ret != DMERR_OK) { dmErrorMsg("Failed to decode bitmap data %d: %s\n", ret, dmErrorStr(ret)); - goto error; + goto exit; } if (fmt == NULL) { dmErrorMsg("Probing could not find any matching image format. Perhaps try forcing a format via -f.\n"); - goto error; + goto exit; } dmDumpC64Image(dataSize, cimage, fmt); if (optProbeOnly) - goto error; + goto exit; // Initialize libSDL if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { dmErrorMsg("Could not initialize SDL: %s\n", SDL_GetError()); - goto error; + goto exit; } initSDL = TRUE; @@ -277,7 +277,7 @@ if (screen == NULL) { dmErrorMsg("Can't SDL_SetVideoMode(): %s\n", SDL_GetError()); - goto error; + goto exit; } // Create surface (we are lazy and ugly) @@ -301,7 +301,7 @@ if (ret != DMERR_OK) { dmErrorMsg("Failed to convert bitmap data %d: %s\n", ret, dmErrorStr(ret)); - goto error; + goto exit; } // Set window title and caption @@ -337,7 +337,7 @@ optScrWidth = event.resize.w; optScrHeight = event.resize.h; if (!dmInitializeVideo(&screen)) - goto error; + goto exit; needRedraw = TRUE; break; @@ -359,7 +359,7 @@ if (SDL_MUSTLOCK(screen) != 0 && SDL_LockSurface(screen) != 0) { dmErrorMsg("Can't lock surface.\n"); - goto error; + goto exit; } dmScaledBlitSurface8to8(surf, 0, ypos, optScrWidth, sheight, screen); @@ -375,8 +375,7 @@ SDL_Delay(100); } - -error: +exit: dmC64ImageFree(cimage); if (screen)