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

xlink: replace awkward fatalerror() with standard errx(3)

Browse Source 
fatalerror() prints a given string to stdout and exits(5). It
cannot format text, so there was a string temptext used with
sprintf() to format text and pass it to fatalerror().

errx() can format text, and it prints to stderr.

As a bonus, this fixes the linking warnings from use of sprintf().
This commit is contained in:
bentley
2010-01-14 23:17:22 -07:00
parent bb85782faa
commit 0b08fca9f2
8 changed files with 63 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/link/main.c
View File

@@ -1,3 +1,4 @@
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -31,17 +32,6 @@ enum eOutputType outputtype = OUTPUT_GBROM;
char temptext[1024];
char smartlinkstartsymbol[256];
/*
* Print out an errormessage
*
*/
void
fatalerror(char *s)
{
printf("*ERROR* : %s\n", s);
exit(5);
}
/*
* Print the usagescreen
*
@@ -76,8 +66,7 @@ ProcessLinkfile(char *tzLinkfile)
pLinkfile = fopen(tzLinkfile, "rt");
if (!pLinkfile) {
sprintf(temptext, "Unable to find linkfile '%s'\n", tzLinkfile);
fatalerror(temptext);
errx(5, "Unable to find linkfile '%s'", tzLinkfile);
}
while (!feof(pLinkfile)) {
char tzLine[256];
@@ -99,10 +88,9 @@ ProcessLinkfile(char *tzLinkfile)
CurrentBlock = BLOCK_COMMENT;
else {
fclose(pLinkfile);
sprintf(temptext,
"Unknown block '%s'\n",
errx(5,
"Unknown block '%s'",
tzLine);
fatalerror(temptext);
}
} else {
switch (CurrentBlock) {
@@ -167,9 +155,8 @@ main(int argc, char *argv[])
outputtype = OUTPUT_PSION2;
break;
default:
sprintf(temptext, "Unknown option 't%c'\n",
errx(5, "Unknown option 't%c'",
opt);
fatalerror(temptext);
break;
}
break;
@@ -184,12 +171,12 @@ main(int argc, char *argv[])
sscanf(argv[argn - 1] + 2, "%lx",
&fillchar);
if (!((result == EOF) || (result == 1))) {
fatalerror
("Invalid argument for option 'z'\n");
errx(5,
"Invalid argument for option 'z'");
}
}
} else {
fatalerror("Invalid argument for option 'z'\n");
errx(5, "Invalid argument for option 'z'");
}
break;
case 's':
@@ -197,8 +184,7 @@ main(int argc, char *argv[])
strcpy(smartlinkstartsymbol, argv[argn - 1] + 2);
break;
default:
sprintf(temptext, "Unknown option '%c'\n", opt);
fatalerror(temptext);
errx(5, "Unknown option '%c'", opt);
break;
}
}