Mercurial > hg > dmlib
diff tools/view64.c @ 958:985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 27 Feb 2015 03:58:25 +0200 |
parents | 81ff7111fedf |
children | e8c99da451cd |
line wrap: on
line diff
--- a/tools/view64.c Fri Feb 27 02:21:57 2015 +0200 +++ b/tools/view64.c Fri Feb 27 03:58:25 2015 +0200 @@ -81,7 +81,7 @@ { if (factor < 1 || factor >= 10) { - dmError("Invalid scale factor %1.0f, see help for valid values.\n", factor); + dmErrorMsg("Invalid scale factor %1.0f, see help for valid values.\n", factor); return FALSE; } @@ -89,7 +89,7 @@ } else { - dmError("Invalid scale factor '%s'.\n", optArg); + dmErrorMsg("Invalid scale factor '%s'.\n", optArg); return FALSE; } } @@ -102,21 +102,21 @@ { if (i < 0 || i >= ndmC64ImageFormats) { - dmError("Invalid image format index %d, see help for valid values.\n", i); + dmErrorMsg("Invalid image format index %d, see help for valid values.\n", i); return FALSE; } optForcedFormat = i; } else { - dmError("Invalid image format argument '%s'.\n", optArg); + dmErrorMsg("Invalid image format argument '%s'.\n", optArg); return FALSE; } } break; default: - dmError("Unknown option '%s'.\n", currArg); + dmErrorMsg("Unknown option '%s'.\n", currArg); return FALSE; } @@ -133,7 +133,7 @@ } else { - dmError("Too many filenames specified ('%s')\n", filename); + dmErrorMsg("Too many filenames specified ('%s')\n", filename); return FALSE; } } @@ -144,7 +144,7 @@ *screen = SDL_SetVideoMode(optScrWidth, optScrHeight, 8, optVFlags | SDL_RESIZABLE); if (*screen == NULL) { - dmError("Can't SDL_SetVideoMode(): %s\n", SDL_GetError()); + dmErrorMsg("Can't SDL_SetVideoMode(): %s\n", SDL_GetError()); return FALSE; } return TRUE; @@ -175,7 +175,7 @@ if (optFilename == NULL) { - dmError("No input file specified, perhaps you need some --help\n"); + dmErrorMsg("No input file specified, perhaps you need some --help\n"); goto error; } @@ -198,7 +198,7 @@ if (ret < 0) { - dmError("Failed to decode bitmap data %d: %s\n", ret, dmErrorStr(ret)); + dmErrorMsg("Failed to decode bitmap data %d: %s\n", ret, dmErrorStr(ret)); goto error; } @@ -210,14 +210,14 @@ if (fmt == NULL) { - dmError("Probing could not find any matching image format. Perhaps try forcing a format via -f.\n"); + dmErrorMsg("Probing could not find any matching image format. Perhaps try forcing a format via -f.\n"); goto error; } // Initialize libSDL if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { - dmError("Could not initialize SDL: %s\n", SDL_GetError()); + dmErrorMsg("Could not initialize SDL: %s\n", SDL_GetError()); goto error; } initSDL = TRUE; @@ -227,7 +227,7 @@ screen = SDL_SetVideoMode(optScrWidth, optScrHeight, 8, optVFlags | SDL_RESIZABLE); if (screen == NULL) { - dmError("Can't SDL_SetVideoMode(): %s\n", SDL_GetError()); + dmErrorMsg("Can't SDL_SetVideoMode(): %s\n", SDL_GetError()); goto error; } @@ -304,7 +304,7 @@ if (SDL_MUSTLOCK(screen) != 0 && SDL_LockSurface(screen) != 0) { - dmError("Can't lock surface.\n"); + dmErrorMsg("Can't lock surface.\n"); goto error; }