# HG changeset patch # User Matti Hamalainen # Date 1560459545 -10800 # Node ID f331cc750b37bb077db9bed29490731520306be3 # Parent c26a51ea70be9a0a3e91f9385169c5d3967ef404 Rename variable. diff -r c26a51ea70be -r f331cc750b37 tools/64vw.c --- a/tools/64vw.c Thu Jun 13 23:58:46 2019 +0300 +++ b/tools/64vw.c Thu Jun 13 23:59:05 2019 +0300 @@ -267,7 +267,7 @@ SDL_Surface *surf = NULL; BOOL initSDL = FALSE, exitFlag, needRedraw; size_t currIndex, prevIndex; - int ret; + int res; dmC64InitializeFormats(); dmSetScaleFactor(2.0); @@ -318,12 +318,12 @@ const DMC64ImageFormat *fmt = NULL; DMC64Image *cimage = NULL; - if ((ret = dmReadC64Image(filename, forced, &fmt, &cimage)) != DMERR_OK) + if ((res = dmReadC64Image(filename, forced, &fmt, &cimage)) != DMERR_OK) { - if (!optListOnly && ret != DMERR_NOT_SUPPORTED) + if (!optListOnly && res != DMERR_NOT_SUPPORTED) { dmErrorMsg("Could not decode file '%s': %s\n", - filename, dmErrorStr(ret)); + filename, dmErrorStr(res)); } } else @@ -350,7 +350,7 @@ dmMsg(1, "Using character ROM file '%s'.\n", optCharROMFilename); - if ((ret = dmReadDataFile(NULL, optCharROMFilename, + if ((res = dmReadDataFile(NULL, optCharROMFilename, &setCharROM.data, &setCharROM.size)) != DMERR_OK) { dmErrorMsg("Could not read character ROM from '%s'.\n", @@ -489,12 +489,12 @@ surf = NULL; } - if ((ret = dmReadC64Image(filename, forced, &fmt, &cimage)) != DMERR_OK) + if ((res = dmReadC64Image(filename, forced, &fmt, &cimage)) != DMERR_OK) { - if (ret != DMERR_NOT_SUPPORTED) + if (res != DMERR_NOT_SUPPORTED) { dmErrorMsg("Could not decode file '%s': %s\n", - filename, dmErrorStr(ret)); + filename, dmErrorStr(res)); } goto fail; }