Format RGBFIX and RGBGFX warnings/errors the same way as RGBASM and RGBLINK

src/fix/warning.cpp

@@ -75,22 +75,26 @@ void warning(WarningID id, char const *fmt, ...) {
 
 	case WarningBehavior::ENABLED:
 		style_Set(stderr, STYLE_YELLOW, true);
-		fprintf(stderr, "warning: [-W%s]\n    ", flag);
+		fputs("warning: ", stderr);
 		style_Reset(stderr);
 		va_start(ap, fmt);
 		vfprintf(stderr, fmt, ap);
 		va_end(ap);
-		putc('\n', stderr);
+		style_Set(stderr, STYLE_YELLOW, true);
+		fprintf(stderr, " [-W%s]\n", flag);
+		style_Reset(stderr);
 		break;
 
 	case WarningBehavior::ERROR:
 		style_Set(stderr, STYLE_RED, true);
-		fprintf(stderr, "error: [-Werror=%s]\n    ", flag);
+		fputs("error: ", stderr);
 		style_Reset(stderr);
 		va_start(ap, fmt);
 		vfprintf(stderr, fmt, ap);
 		va_end(ap);
-		putc('\n', stderr);
+		style_Set(stderr, STYLE_RED, true);
+		fprintf(stderr, " [-Werror=%s]\n", flag);
+		style_Reset(stderr);
 
 		warnings.incrementErrors();
 		break;

src/gfx/warning.cpp

@@ -84,22 +84,26 @@ void warning(WarningID id, char const *fmt, ...) {
 
 	case WarningBehavior::ENABLED:
 		style_Set(stderr, STYLE_YELLOW, true);
-		fprintf(stderr, "warning: [-W%s]\n    ", flag);
+		fputs("warning: ", stderr);
 		style_Reset(stderr);
 		va_start(ap, fmt);
 		vfprintf(stderr, fmt, ap);
 		va_end(ap);
-		putc('\n', stderr);
+		style_Set(stderr, STYLE_YELLOW, true);
+		fprintf(stderr, " [-W%s]\n", flag);
+		style_Reset(stderr);
 		break;
 
 	case WarningBehavior::ERROR:
 		style_Set(stderr, STYLE_RED, true);
-		fprintf(stderr, "error: [-Werror=%s]\n    ", flag);
+		fputs("error: ", stderr);
 		style_Reset(stderr);
 		va_start(ap, fmt);
 		vfprintf(stderr, fmt, ap);
 		va_end(ap);
-		putc('\n', stderr);
+		style_Set(stderr, STYLE_YELLOW, true);
+		fprintf(stderr, " [-Werror=%s]\n", flag);
+		style_Reset(stderr);
 
 		warnings.incrementErrors();
 		break;

test/fix/bad-mbc-number.err

@@ -1,2 +1 @@
-warning: [-Wmbc]
+warning: MBC "(unknown)" has no RAM, but RAM size was set to 2 [-Wmbc]
-    MBC "(unknown)" has no RAM, but RAM size was set to 2

test/fix/color.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag

test/fix/compatible.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag

test/fix/custom-logo.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the logo [-Woverwrite]
-    Overwrote a non-zero byte in the logo

test/fix/dollar-hex.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type

test/fix/fix-override.err

@@ -1,3 +1,2 @@
 warning: 'l' overriding 'L' in fix spec
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo

test/fix/gameid-trunc.err

@@ -1,4 +1,2 @@
-warning: [-Wtruncation]
+warning: Truncating game ID "FOUR!" to 4 chars [-Wtruncation]
-    Truncating game ID "FOUR!" to 4 chars
+warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite]
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the manufacturer code

test/fix/gameid.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite]
-    Overwrote a non-zero byte in the manufacturer code

test/fix/global-large.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum

test/fix/global-larger.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum

test/fix/global-trash.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum

test/fix/global.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum

test/fix/header-edit.err

@@ -1,4 +1,2 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum

test/fix/header-trash.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum

test/fix/header.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum

test/fix/jp.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the destination code [-Woverwrite]
-    Overwrote a non-zero byte in the destination code

test/fix/logo-trash.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo

test/fix/logo.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo

test/fix/mbc-rom-ram-battery.err

@@ -1,2 +1 @@
-warning: [-Wmbc]
+warning: MBC "ROM+RAM+BATTERY" is under-specified and poorly supported [-Wmbc]
-    MBC "ROM+RAM+BATTERY" is under-specified and poorly supported

test/fix/mbc-rom-ram.err

@@ -1,2 +1 @@
-warning: [-Wmbc]
+warning: MBC "ROM+RAM" is under-specified and poorly supported [-Wmbc]
-    MBC "ROM+RAM" is under-specified and poorly supported

test/fix/mbc.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type

test/fix/mbcless-ram.err

@@ -1,6 +1,3 @@
-warning: [-Wmbc]
+warning: MBC "ROM" has no RAM, but RAM size was set to 2 [-Wmbc]
-    MBC "ROM" has no RAM, but RAM size was set to 2
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size

test/fix/new-lic-trunc.err

@@ -1,4 +1,2 @@
-warning: [-Wtruncation]
+warning: Truncating new licensee "HOMEBREW" to 2 chars [-Wtruncation]
-    Truncating new licensee "HOMEBREW" to 2 chars
+warning: Overwrote a non-zero byte in the new licensee code [-Woverwrite]
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the new licensee code

test/fix/new-lic.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the new licensee code [-Woverwrite]
-    Overwrote a non-zero byte in the new licensee code

test/fix/old-lic-hex.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite]
-    Overwrote a non-zero byte in the old licensee code

test/fix/old-lic.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite]
-    Overwrote a non-zero byte in the old licensee code

test/fix/ram.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size

test/fix/ramful-mbc-no-ram.err

@@ -1,6 +1,3 @@
-warning: [-Wmbc]
+warning: MBC "MBC3+RAM" has RAM, but RAM size was set to 0 [-Wmbc]
-    MBC "MBC3+RAM" has RAM, but RAM size was set to 0
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size

test/fix/ramful-mbc.err

@@ -1,4 +1,2 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size

test/fix/ramless-mbc.err

@@ -1,4 +1,2 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size

test/fix/sgb-licensee.err

@@ -1,6 +1,3 @@
-warning: [-Wsgb]
+warning: SGB compatibility enabled, but old licensee is 0x45, not 0x33 [-Wsgb]
-    SGB compatibility enabled, but old licensee is 0x45, not 0x33
+warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite]
-    Overwrote a non-zero byte in the SGB flag
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the old licensee code

test/fix/sgb-old-licensee.err

@@ -1,4 +1,2 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the SGB flag
+warning: SGB compatibility enabled, but old licensee was 0xc5, not 0x33 [-Wsgb]
-warning: [-Wsgb]
-    SGB compatibility enabled, but old licensee was 0xc5, not 0x33

test/fix/sgb.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the SGB flag

test/fix/title-color-trunc-rev.err

@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
+warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 15 chars
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag

test/fix/title-color-trunc.err

@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
+warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 15 chars
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag

test/fix/title-compat-trunc-rev.err

@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
+warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 15 chars
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag

test/fix/title-compat-trunc.err

@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
+warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 15 chars
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag

test/fix/title-gameid-trunc-rev.err

@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
+warning: Truncating title "0123456789ABCDEF" to 11 chars [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 11 chars
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the manufacturer code

test/fix/title-gameid-trunc.err

@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
+warning: Truncating title "0123456789ABCDEF" to 11 chars [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 11 chars
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the manufacturer code

test/fix/title-pad.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-    Overwrote a non-zero byte in the title

test/fix/title-trunc.err

@@ -1,4 +1,2 @@
-warning: [-Wtruncation]
+warning: Truncating title "0123456789ABCDEFGHIJK" to 16 chars [-Wtruncation]
-    Truncating title "0123456789ABCDEFGHIJK" to 16 chars
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title

test/fix/title.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
-    Overwrote a non-zero byte in the title

test/fix/tpp1-features.err

@@ -1,10 +1,5 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
+warning: Overwrote a non-zero byte in the TPP1 identification code [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 revision number [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 identification code
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 feature flags [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 revision number
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 feature flags

test/fix/tpp1-nonjap.err

@@ -1,10 +1,5 @@
-warning: [-Wmbc]
+warning: TPP1 overwrites region flag for its identification code, ignoring `-j` [-Wmbc]
-    TPP1 overwrites region flag for its identification code, ignoring `-j`
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 identification code [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
+warning: Overwrote a non-zero byte in the TPP1 revision number [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 feature flags [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 identification code
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 revision number
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 feature flags

test/fix/verify-pad.err

@@ -1,6 +1,3 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum

test/fix/verify-trash.err

@@ -1,6 +1,3 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum

test/fix/verify.err

@@ -1,6 +1,3 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum

test/fix/version.err

@@ -1,2 +1 @@
-warning: [-Woverwrite]
+warning: Overwrote a non-zero byte in the mask ROM version number [-Woverwrite]
-    Overwrote a non-zero byte in the mask ROM version number

test/gfx/warn_embedded.err

@@ -1,3 +1,2 @@
-error: [-Werror=embedded]
+error: Sorting palette colors by PNG's embedded PLTE chunk without '-c/--colors embedded' [-Werror=embedded]
-    Sorting palette colors by PNG's embedded PLTE chunk without '-c/--colors embedded'
 Conversion aborted after 1 error

test/gfx/warn_trim_nonempty.err

@@ -1,2 +1 @@
-warning: [-Wtrim-nonempty]
+warning: Trimming a nonempty tile (configure with '-x/--trim-end') [-Wtrim-nonempty]
-    Trimming a nonempty tile (configure with '-x/--trim-end')