# HG changeset patch # User Matti Hamalainen # Date 1560481455 -10800 # Node ID f8bba7a82ec29e214f6bb72b6de15cbb5a71ca32 # Parent b1e392da834671066bb6ddddd7dc4b834ca8aa37 Rename variable. diff -r b1e392da8346 -r f8bba7a82ec2 tools/gfxconv.c --- a/tools/gfxconv.c Fri Jun 14 06:03:47 2019 +0300 +++ b/tools/gfxconv.c Fri Jun 14 06:04:15 2019 +0300 @@ -137,7 +137,7 @@ int optColorMap[D64_NCOLORS]; char *optCharROMFilename = NULL; DMC64Palette *optC64Palette = NULL; -char *optC64PaletteFile = NULL; +char *optPaletteFile = NULL; DMImageWriteSpec optSpec = @@ -965,7 +965,7 @@ break; case 22: - return argHandleC64PaletteOption(optArg, &optC64Palette, &optC64PaletteFile); + return argHandleC64PaletteOption(optArg, &optC64Palette, &optPaletteFile); default: dmErrorMsg("Unimplemented option argument '%s'.\n", currArg); @@ -2152,9 +2152,9 @@ } } - if (optC64PaletteFile != NULL) + if (optPaletteFile != NULL) { - if ((res = dmHandleExternalPalette(optC64PaletteFile, &optC64Spec.pal)) != DMERR_OK) + if ((res = dmHandleExternalPalette(optPaletteFile, &optC64Spec.pal)) != DMERR_OK) goto exit; } else