gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Provide a per-option sane default when number parsing fails

Browse Source
This commit is contained in:
ISSOtm
2022-03-12 13:40:31 +01:00
committed by Eldred Habert
parent 2307981878
commit f29c5d81ec
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gfx/main.cpp
View File

@@ -141,13 +141,13 @@ static void printUsage(void) {
/** /**
* Parses a number at the beginning of a string, moving the pointer to skip the parsed characters * Parses a number at the beginning of a string, moving the pointer to skip the parsed characters
* Returns -1 on error * Returns the provided errVal on error
*/ */
static uint16_t parseNumber(char *&string, char const *errPrefix) { static uint16_t parseNumber(char *&string, char const *errPrefix, uint16_t errVal = -1) {
uint8_t base = 10; uint8_t base = 10;
if (*string == '\0') { if (*string == '\0') {
error("%s: expected number, but found nothing", errPrefix); error("%s: expected number, but found nothing", errPrefix);
return -1; return errVal;
} else if (*string == '$') { } else if (*string == '$') {
base = 16; base = 16;
++string; ++string;
@@ -188,8 +188,9 @@ static uint16_t parseNumber(char *&string, char const *errPrefix) {
}; };
if (charIndex(*string) == (uint8_t)-1) { if (charIndex(*string) == (uint8_t)-1) {
error("%s: expected digit%s, but found nothing", errPrefix, base != 10 ? " after base" : ""); error("%s: expected digit%s, but found nothing", errPrefix,
return -1; base != 10 ? " after base" : "");
return errVal;
} }
uint16_t number = 0; uint16_t number = 0;
do { do {
@@ -205,7 +206,7 @@ static uint16_t parseNumber(char *&string, char const *errPrefix) {
// The lax check covers the addition on top of the multiplication // The lax check covers the addition on top of the multiplication
if (number >= UINT16_MAX / base) { if (number >= UINT16_MAX / base) {
error("%s: the number is too large!", errPrefix); error("%s: the number is too large!", errPrefix);
return -1; return errVal;
} }
} while (*string != '\0'); // No more characters? } while (*string != '\0'); // No more characters?
@@ -247,7 +248,7 @@ int main(int argc, char *argv[]) {
options.attrmap = musl_optarg; options.attrmap = musl_optarg;
break; break;
case 'b': case 'b':
options.baseTileIDs[0] = parseNumber(arg, "Bank 0 base tile ID"); options.baseTileIDs[0] = parseNumber(arg, "Bank 0 base tile ID", 0);
if (options.baseTileIDs[0] >= 256) { if (options.baseTileIDs[0] >= 256) {
error("Bank 0 base tile ID must be below 256"); error("Bank 0 base tile ID must be below 256");
} }
@@ -262,7 +263,7 @@ int main(int argc, char *argv[]) {
break; break;
} }
skipWhitespace(arg); skipWhitespace(arg);
options.baseTileIDs[1] = parseNumber(arg, "Bank 1 base tile ID"); options.baseTileIDs[1] = parseNumber(arg, "Bank 1 base tile ID", 0);
if (options.baseTileIDs[1] >= 256) { if (options.baseTileIDs[1] >= 256) {
error("Bank 1 base tile ID must be below 256"); error("Bank 1 base tile ID must be below 256");
} }
@@ -282,7 +283,7 @@ int main(int argc, char *argv[]) {
warning("Ignoring retired option `-D`"); warning("Ignoring retired option `-D`");
break; break;
case 'd': case 'd':
options.bitDepth = parseNumber(arg, "Bit depth"); options.bitDepth = parseNumber(arg, "Bit depth", 2);
if (*arg != '\0') { if (*arg != '\0') {
error("Bit depth (-b) argument must be a valid number, not \"%s\"", musl_optarg); error("Bit depth (-b) argument must be a valid number, not \"%s\"", musl_optarg);
} else if (options.bitDepth != -1 && options.bitDepth != 1 && options.bitDepth != 2) { } else if (options.bitDepth != -1 && options.bitDepth != 1 && options.bitDepth != 2) {
@@ -322,7 +323,7 @@ int main(int argc, char *argv[]) {
options.palettes = musl_optarg; options.palettes = musl_optarg;
break; break;
case 's': case 's':
options.nbColorsPerPal = parseNumber(arg, "Number of colors per palette"); options.nbColorsPerPal = parseNumber(arg, "Number of colors per palette", 4);
if (*arg != '\0') { if (*arg != '\0') {
error("Palette size (-s) argument must be a valid number, not \"%s\"", musl_optarg); error("Palette size (-s) argument must be a valid number, not \"%s\"", musl_optarg);
} }
@@ -343,7 +344,7 @@ int main(int argc, char *argv[]) {
} }
break; break;
case 'x': case 'x':
options.trim = parseNumber(arg, "Number of tiles to trim"); options.trim = parseNumber(arg, "Number of tiles to trim", 0);
if (*arg != '\0') { if (*arg != '\0') {
error("Tile trim (-x) argument must be a valid number, not \"%s\"", musl_optarg); error("Tile trim (-x) argument must be a valid number, not \"%s\"", musl_optarg);
} }