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

Revert use of system exit codes.

Browse Source 
While well‐intentioned, in practice this hurts portability and
really, nobody checks the return codes anyway.
This commit is contained in:
Anthony J. Bentley
2011-06-04 21:33:03 -06:00
parent d784b14615
commit b1a2c664a9
6 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/asm/main.c
View File

@@ -10,7 +10,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sysexits.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
@@ -137,7 +136,7 @@ opt_Parse(char *s)
newopt.gbgfx[2] = s[3]; newopt.gbgfx[2] = s[3];
newopt.gbgfx[3] = s[4]; newopt.gbgfx[3] = s[4];
} else { } else {
errx(EX_USAGE, "Must specify exactly 4 characters for option 'g'"); errx(1, "Must specify exactly 4 characters for option 'g'");
} }
break; break;
case 'b': case 'b':
@@ -231,7 +230,7 @@ PrintUsage(void)
printf("RGBAsm v" ASM_VERSION " (part of ASMotor " ASMOTOR_VERSION printf("RGBAsm v" ASM_VERSION " (part of ASMotor " ASMOTOR_VERSION
")\n\n"); ")\n\n");
printf("Usage: rgbasm [-b chars] [-g chars] [-i path] [-o outfile] [-p pad_value] file\n"); printf("Usage: rgbasm [-b chars] [-g chars] [-i path] [-o outfile] [-p pad_value] file\n");
exit(EX_USAGE); exit(1);
} }
/* /*
* RGBAsm - MAIN.C * RGBAsm - MAIN.C
@@ -274,7 +273,7 @@ main(int argc, char *argv[])
newopt.binary[0] = optarg[1]; newopt.binary[0] = optarg[1];
newopt.binary[1] = optarg[2]; newopt.binary[1] = optarg[2];
} else { } else {
errx(EX_USAGE, "Must specify exactly 2 characters for option 'b'"); errx(1, "Must specify exactly 2 characters for option 'b'");
} }
case 'g': case 'g':
if (strlen(optarg) == 4) { if (strlen(optarg) == 4) {
@@ -283,7 +282,7 @@ main(int argc, char *argv[])
newopt.gbgfx[2] = optarg[3]; newopt.gbgfx[2] = optarg[3];
newopt.gbgfx[3] = optarg[4]; newopt.gbgfx[3] = optarg[4];
} else { } else {
errx(EX_USAGE, "Must specify exactly 4 characters for option 'g'"); errx(1, "Must specify exactly 4 characters for option 'g'");
} }
break; break;
case 'i': case 'i':
@@ -295,9 +294,9 @@ main(int argc, char *argv[])
case 'p': case 'p':
newopt.fillchar = strtoul(optarg, &ep, 0); newopt.fillchar = strtoul(optarg, &ep, 0);
if (optarg[0] == '\0' || *ep != '\0') if (optarg[0] == '\0' || *ep != '\0')
errx(EX_USAGE, "Invalid argument for option 'p'"); errx(1, "Invalid argument for option 'p'");
if (newopt.fillchar < 0 || newopt.fillchar > 0xFF) if (newopt.fillchar < 0 || newopt.fillchar > 0xFF)
errx(EX_USAGE, "Argument for option 'p' must be between 0 and 0xFF"); errx(1, "Argument for option 'p' must be between 0 and 0xFF");
break; break;
default: default:
PrintUsage(); PrintUsage();

1
src/asm/yaccprt1.y
View File

@@ -5,7 +5,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sysexits.h>
#include "asm/symbol.h" #include "asm/symbol.h"
#include "asm/asm.h" #include "asm/asm.h"

7
src/lib/main.c
View File

@@ -4,7 +4,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sysexits.h>
#include "asmotor.h" #include "asmotor.h"
@@ -21,7 +20,7 @@ usage(void)
{ {
printf("RGBLib v" LIB_VERSION " (part of ASMotor " ASMOTOR_VERSION ")\n\n"); printf("RGBLib v" LIB_VERSION " (part of ASMotor " ASMOTOR_VERSION ")\n\n");
printf("usage: rgblib file [add | delete | extract | list] [module ...]\n"); printf("usage: rgblib file [add | delete | extract | list] [module ...]\n");
exit(EX_USAGE); exit(1);
} }
/* /*
* The main routine * The main routine
@@ -85,10 +84,10 @@ main(int argc, char *argv[])
("Extracted module '%s'\n", ("Extracted module '%s'\n",
argv[argn]); argv[argn]);
} else } else
err(EX_NOINPUT, err(1,
"Unable to write module '%s'", argv[argn]); "Unable to write module '%s'", argv[argn]);
} else } else
errx(EX_NOINPUT, "Module not found"); errx(1, "Module not found");
argn += 1; argn += 1;
argc -= 1; argc -= 1;

7
src/link/main.c
View File

@@ -2,7 +2,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sysexits.h>
#include <unistd.h> #include <unistd.h>
#include "asmotor.h" #include "asmotor.h"
@@ -40,7 +39,7 @@ usage(void)
printf("usage: rgblink [-t] [-l library] [-m mapfile] [-n symfile] [-o outfile]\n"); printf("usage: rgblink [-t] [-l library] [-m mapfile] [-n symfile] [-o outfile]\n");
printf("\t [-s symbol] [-z pad_value] objectfile [...]\n"); printf("\t [-s symbol] [-z pad_value] objectfile [...]\n");
exit(EX_USAGE); exit(1);
} }
/* /*
@@ -74,9 +73,9 @@ main(int argc, char *argv[])
case 'p': case 'p':
fillchar = strtoul(optarg, &ep, 0); fillchar = strtoul(optarg, &ep, 0);
if (optarg[0] == '\0' || *ep != '\0') if (optarg[0] == '\0' || *ep != '\0')
errx(EX_USAGE, "Invalid argument for option 'p'"); errx(1, "Invalid argument for option 'p'");
if (fillchar < 0 || fillchar > 0xFF) if (fillchar < 0 || fillchar > 0xFF)
errx(EX_USAGE, "Argument for option 'p' must be between 0 and 0xFF"); errx(1, "Argument for option 'p' must be between 0 and 0xFF");
break; break;
case 's': case 's':
options |= OPT_SMART_C_LINK; options |= OPT_SMART_C_LINK;

5
src/link/mapfile.c
View File

@@ -3,7 +3,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sysexits.h>
#include "asmotor.h" #include "asmotor.h"
@@ -22,7 +21,7 @@ SetMapfileName(char *name)
mf = fopen(name, "w"); mf = fopen(name, "w");
if (mf == NULL) if (mf == NULL)
err(EX_CANTCREAT, "Cannot open mapfile '%s'", name); err(1, "Cannot open mapfile '%s'", name);
} }
void void
@@ -31,7 +30,7 @@ SetSymfileName(char *name)
sf = fopen(name, "w"); sf = fopen(name, "w");
if (sf == NULL) if (sf == NULL)
errx(EX_CANTCREAT, "Cannot open symfile '%s'", name); errx(1, "Cannot open symfile '%s'", name);
fprintf(sf, ";File generated by xLink v" LINK_VERSION "\n\n"); fprintf(sf, ";File generated by xLink v" LINK_VERSION "\n\n");
} }

5
src/link/object.c
View File

@@ -8,7 +8,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sysexits.h>
#include "link/mylink.h" #include "link/mylink.h"
#include "link/main.h" #include "link/main.h"
@@ -446,7 +445,7 @@ obj_Readfile(char *tzObjectfile)
pObjfile = fopen(tzObjectfile, "rb"); pObjfile = fopen(tzObjectfile, "rb");
if (pObjfile == NULL) if (pObjfile == NULL)
err(EX_NOINPUT, "Unable to open object '%s'", err(1, "Unable to open object '%s'",
tzObjectfile); tzObjectfile);
obj_ReadOpenFile(pObjfile, tzObjectfile); obj_ReadOpenFile(pObjfile, tzObjectfile);
fclose(pObjfile); fclose(pObjfile);
@@ -496,7 +495,7 @@ lib_Readfile(char *tzLibfile)
pObjfile = fopen(tzLibfile, "rb"); pObjfile = fopen(tzLibfile, "rb");
if (pObjfile == NULL) if (pObjfile == NULL)
err(EX_NOINPUT, "Unable to open object '%s'", tzLibfile); err(1, "Unable to open object '%s'", tzLibfile);
if (!pObjfile) { if (!pObjfile) {
errx(5, "Unable to open '%s'", tzLibfile); errx(5, "Unable to open '%s'", tzLibfile);
} }