diff --git a/src/asm/main.c b/src/asm/main.c index 8423c029..ef7155a3 100644 --- a/src/asm/main.c +++ b/src/asm/main.c @@ -20,8 +20,6 @@ int cldefines_index; int cldefines_size; char **cldefines; -char *progname; - clock_t nStartClock, nEndClock; SLONG nLineNo; ULONG nTotalLines, nPass, nPC, nIFDepth, nErrors; @@ -301,8 +299,6 @@ main(int argc, char *argv[]) if (argc == 1) usage(); - progname = "rgbasm"; - /* yydebug=1; */ DefaultOptions.gbgfx[0] = '0'; diff --git a/src/extern/err.c b/src/extern/err.c index bfeced2b..77c653e0 100644 --- a/src/extern/err.c +++ b/src/extern/err.c @@ -26,11 +26,9 @@ #include #include "extern/err.h" -extern char *progname; - void rgbds_vwarn(const char *fmt, va_list ap) { - fprintf (stderr, "%s: warning", progname); + fprintf (stderr, "warning"); if (fmt) { fputs (": ", stderr); vfprintf(stderr, fmt, ap); @@ -41,7 +39,7 @@ void rgbds_vwarn(const char *fmt, va_list ap) void rgbds_vwarnx(const char *fmt, va_list ap) { - fprintf (stderr, "%s: warning", progname); + fprintf (stderr, "warning"); if (fmt) { fputs (": ", stderr); vfprintf(stderr, fmt, ap); @@ -51,7 +49,7 @@ void rgbds_vwarnx(const char *fmt, va_list ap) noreturn void rgbds_verr(int status, const char *fmt, va_list ap) { - fprintf (stderr, "%s: error", progname); + fprintf (stderr, "error"); if (fmt) { fputs (": ", stderr); vfprintf(stderr, fmt, ap); @@ -62,7 +60,7 @@ noreturn void rgbds_verr(int status, const char *fmt, va_list ap) noreturn void rgbds_verrx(int status, const char *fmt, va_list ap) { - fprintf (stderr, "%s: error", progname); + fprintf (stderr, "error"); if (fmt) { fputs (": ", stderr); vfprintf(stderr, fmt, ap); diff --git a/src/fix/main.c b/src/fix/main.c index 26d33877..f634ce57 100644 --- a/src/fix/main.c +++ b/src/fix/main.c @@ -23,8 +23,6 @@ #include "extern/err.h" -char *progname; - static void usage(void) { @@ -71,8 +69,6 @@ main(int argc, char *argv[]) int version; /* mask ROM version number */ int padvalue; /* to pad the rom with if it changes size */ - progname = "rgbfix"; - while ((ch = getopt(argc, argv, "Cci:jk:l:m:n:p:sr:t:v")) != -1) { switch (ch) { case 'C': diff --git a/src/gfx/main.c b/src/gfx/main.c index fac25d5d..cc8bca2a 100644 --- a/src/gfx/main.c +++ b/src/gfx/main.c @@ -19,8 +19,6 @@ #include #include "gfx/main.h" -char *progname; - static void usage(void) { @@ -41,8 +39,6 @@ main(int argc, char *argv[]) char *ext; const char *errmsg = "Warning: The PNG's %s setting is not the same as the setting defined on the command line."; - progname = "rgbgfx"; - if (argc == 1) { usage(); } diff --git a/src/link/main.c b/src/link/main.c index d602f77f..c24d0f6b 100644 --- a/src/link/main.c +++ b/src/link/main.c @@ -24,8 +24,6 @@ SLONG options = 0; SLONG fillchar = 0; char *smartlinkstartsymbol; -char *progname; - /* * Print the usagescreen * @@ -54,8 +52,6 @@ main(int argc, char *argv[]) if (argc == 1) usage(); - progname = "rgblink"; - while ((ch = getopt(argc, argv, "l:m:n:o:O:p:s:tw")) != -1) { switch (ch) { case 'l': diff --git a/test/asm/undefined-dot.out b/test/asm/undefined-dot.out index e1e4ffb6..c1966e4b 100644 --- a/test/asm/undefined-dot.out +++ b/test/asm/undefined-dot.out @@ -1,3 +1,3 @@ ERROR: undefined-dot.asm(3): '.' not defined -rgbasm: error: Assembly aborted in pass 2 (1 errors)! +error: Assembly aborted in pass 2 (1 errors)! diff --git a/test/link/romx-tiny-no-t.out b/test/link/romx-tiny-no-t.out index 700b9a74..dabf2904 100644 --- a/test/link/romx-tiny-no-t.out +++ b/test/link/romx-tiny-no-t.out @@ -1 +1 @@ -rgblink: error: Unable to place 'r0b' (ROM0 section) anywhere +error: Unable to place 'r0b' (ROM0 section) anywhere diff --git a/test/link/romx-tiny-t.out b/test/link/romx-tiny-t.out index e8fa3e82..ef714e24 100644 --- a/test/link/romx-tiny-t.out +++ b/test/link/romx-tiny-t.out @@ -1 +1 @@ -rgblink: error: ROMX sections can't be used with option -t. +error: ROMX sections can't be used with option -t. diff --git a/test/link/vram-fixed-dmg-mode-w.out b/test/link/vram-fixed-dmg-mode-w.out index 277c6954..1ed998ce 100644 --- a/test/link/vram-fixed-dmg-mode-w.out +++ b/test/link/vram-fixed-dmg-mode-w.out @@ -1 +1 @@ -rgblink: error: VRAM bank 1 can't be used with option -w. +error: VRAM bank 1 can't be used with option -w. diff --git a/test/link/vram-floating-dmg-mode-w.out b/test/link/vram-floating-dmg-mode-w.out index 31ad1d17..4367a910 100644 --- a/test/link/vram-floating-dmg-mode-w.out +++ b/test/link/vram-floating-dmg-mode-w.out @@ -1 +1 @@ -rgblink: error: Unable to place 'v1' (VRAM section) in any bank +error: Unable to place 'v1' (VRAM section) in any bank diff --git a/test/link/wramx-dmg-mode-no-w.out b/test/link/wramx-dmg-mode-no-w.out index 8f5a6dd3..dab00306 100644 --- a/test/link/wramx-dmg-mode-no-w.out +++ b/test/link/wramx-dmg-mode-no-w.out @@ -1 +1 @@ -rgblink: error: Unable to place 'w0b' (WRAM0 section) anywhere +error: Unable to place 'w0b' (WRAM0 section) anywhere diff --git a/test/link/wramx-dmg-mode-w.out b/test/link/wramx-dmg-mode-w.out index 4317b2d4..8ca11a50 100644 --- a/test/link/wramx-dmg-mode-w.out +++ b/test/link/wramx-dmg-mode-w.out @@ -1 +1 @@ -rgblink: error: WRAMX sections can't be used with option -w. +error: WRAMX sections can't be used with option -w.