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

Fix some usually disabled compiler warnings (#1286)

Browse Source 
* Fixes from temporarily re-enabling more compiler warnings

* More edits suggested by cppcheck

* Fix hanging on append_yylval_string

* Fix FOR loop increment
This commit is contained in:
Sylvie
2024-01-18 14:47:20 -05:00
committed by GitHub
parent d179f3ed28
commit 66fd5a7062
13 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gfx/main.cpp
View File

@@ -337,6 +337,7 @@ static std::vector<size_t> readAtFile(std::string const &path, std::vector<char>
static char *parseArgv(int argc, char **argv) {
for (int ch; (ch = musl_getopt_long_only(argc, argv, optstring, longopts, nullptr)) != -1;) {
char *arg = musl_optarg; // Make a copy for scanning
uint16_t number;
switch (ch) {
case -'A':
warning("`--output-attr-map` is deprecated, use `--auto-attr-map` instead");
@@ -351,9 +352,11 @@ static char *parseArgv(int argc, char **argv) {
options.attrmap = musl_optarg;
break;
case 'b':
options.baseTileIDs[0] = parseNumber(arg, "Bank 0 base tile ID", 0);
if (options.baseTileIDs[0] >= 256) {
number = parseNumber(arg, "Bank 0 base tile ID", 0);
if (number >= 256) {
error("Bank 0 base tile ID must be below 256");
} else {
options.baseTileIDs[0] = number;
}
if (*arg == '\0') {
options.baseTileIDs[1] = 0;
@@ -367,9 +370,11 @@ static char *parseArgv(int argc, char **argv) {
}
++arg; // Skip comma
skipWhitespace(arg);
options.baseTileIDs[1] = parseNumber(arg, "Bank 1 base tile ID", 0);
if (options.baseTileIDs[1] >= 256) {
number = parseNumber(arg, "Bank 1 base tile ID", 0);
if (number >= 256) {
error("Bank 1 base tile ID must be below 256");
} else {
options.baseTileIDs[1] = number;
}
if (*arg != '\0') {
error("Base tile IDs must be one or two comma-separated numbers, not \"%s\"",
@@ -479,14 +484,16 @@ static char *parseArgv(int argc, char **argv) {
}
break;
case 'n':
options.nbPalettes = parseNumber(arg, "Number of palettes", 256);
number = parseNumber(arg, "Number of palettes", 256);
if (*arg != '\0') {
error("Number of palettes (-n) must be a valid number, not \"%s\"", musl_optarg);
}
if (options.nbPalettes > 256) {
if (number > 256) {
error("Number of palettes (-n) must not exceed 256!");
} else if (options.nbPalettes == 0) {
} else if (number == 0) {
error("Number of palettes (-n) may not be 0!");
} else {
options.nbPalettes = number;
}
break;
case 'O':