From 30a8503dcd71f63b3078b0ed02237fe1dd1f819f Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 11 Aug 2025 15:16:00 -0400 Subject: [PATCH] Format RGBFIX and RGBGFX warnings/errors the same way as RGBASM and RGBLINK --- src/fix/warning.cpp | 12 ++++++++---- src/gfx/warning.cpp | 12 ++++++++---- test/fix/bad-mbc-number.err | 3 +-- test/fix/color.err | 3 +-- test/fix/compatible.err | 3 +-- test/fix/custom-logo.err | 3 +-- test/fix/dollar-hex.err | 3 +-- test/fix/fix-override.err | 3 +-- test/fix/gameid-trunc.err | 6 ++---- test/fix/gameid.err | 3 +-- test/fix/global-large.err | 3 +-- test/fix/global-larger.err | 3 +-- test/fix/global-trash.err | 3 +-- test/fix/global.err | 3 +-- test/fix/header-edit.err | 6 ++---- test/fix/header-trash.err | 3 +-- test/fix/header.err | 3 +-- test/fix/jp.err | 3 +-- test/fix/logo-trash.err | 3 +-- test/fix/logo.err | 3 +-- test/fix/mbc-rom-ram-battery.err | 3 +-- test/fix/mbc-rom-ram.err | 3 +-- test/fix/mbc.err | 3 +-- test/fix/mbcless-ram.err | 9 +++------ test/fix/new-lic-trunc.err | 6 ++---- test/fix/new-lic.err | 3 +-- test/fix/old-lic-hex.err | 3 +-- test/fix/old-lic.err | 3 +-- test/fix/ram.err | 3 +-- test/fix/ramful-mbc-no-ram.err | 9 +++------ test/fix/ramful-mbc.err | 6 ++---- test/fix/ramless-mbc.err | 6 ++---- test/fix/sgb-licensee.err | 9 +++------ test/fix/sgb-old-licensee.err | 6 ++---- test/fix/sgb.err | 3 +-- test/fix/title-color-trunc-rev.err | 9 +++------ test/fix/title-color-trunc.err | 9 +++------ test/fix/title-compat-trunc-rev.err | 9 +++------ test/fix/title-compat-trunc.err | 9 +++------ test/fix/title-gameid-trunc-rev.err | 9 +++------ test/fix/title-gameid-trunc.err | 9 +++------ test/fix/title-pad.err | 3 +-- test/fix/title-trunc.err | 6 ++---- test/fix/title.err | 3 +-- test/fix/tpp1-features.err | 15 +++++---------- test/fix/tpp1-nonjap.err | 15 +++++---------- test/fix/verify-pad.err | 9 +++------ test/fix/verify-trash.err | 9 +++------ test/fix/verify.err | 9 +++------ test/fix/version.err | 3 +-- test/gfx/warn_embedded.err | 3 +-- test/gfx/warn_trim_nonempty.err | 3 +-- 52 files changed, 105 insertions(+), 186 deletions(-) diff --git a/src/fix/warning.cpp b/src/fix/warning.cpp index a3714c29..537ea8aa 100644 --- a/src/fix/warning.cpp +++ b/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; diff --git a/src/gfx/warning.cpp b/src/gfx/warning.cpp index 31ad13a3..d4421a2a 100644 --- a/src/gfx/warning.cpp +++ b/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; diff --git a/test/fix/bad-mbc-number.err b/test/fix/bad-mbc-number.err index 6ae693f5..a08ea432 100644 --- a/test/fix/bad-mbc-number.err +++ b/test/fix/bad-mbc-number.err @@ -1,2 +1 @@ -warning: [-Wmbc] - MBC "(unknown)" has no RAM, but RAM size was set to 2 +warning: MBC "(unknown)" has no RAM, but RAM size was set to 2 [-Wmbc] diff --git a/test/fix/color.err b/test/fix/color.err index abb49671..ca086e25 100644 --- a/test/fix/color.err +++ b/test/fix/color.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the CGB flag +warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite] diff --git a/test/fix/compatible.err b/test/fix/compatible.err index abb49671..ca086e25 100644 --- a/test/fix/compatible.err +++ b/test/fix/compatible.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the CGB flag +warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite] diff --git a/test/fix/custom-logo.err b/test/fix/custom-logo.err index f2931373..77ed4118 100644 --- a/test/fix/custom-logo.err +++ b/test/fix/custom-logo.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the logo +warning: Overwrote a non-zero byte in the logo [-Woverwrite] diff --git a/test/fix/dollar-hex.err b/test/fix/dollar-hex.err index 44fdfbcf..4b220d11 100644 --- a/test/fix/dollar-hex.err +++ b/test/fix/dollar-hex.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the cartridge type +warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite] diff --git a/test/fix/fix-override.err b/test/fix/fix-override.err index 6eb225b4..d389eec9 100644 --- a/test/fix/fix-override.err +++ b/test/fix/fix-override.err @@ -1,3 +1,2 @@ warning: 'l' overriding 'L' in fix spec -warning: [-Woverwrite] - Overwrote a non-zero byte in the Nintendo logo +warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite] diff --git a/test/fix/gameid-trunc.err b/test/fix/gameid-trunc.err index b5e30084..f4e71aad 100644 --- a/test/fix/gameid-trunc.err +++ b/test/fix/gameid-trunc.err @@ -1,4 +1,2 @@ -warning: [-Wtruncation] - Truncating game ID "FOUR!" to 4 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the manufacturer code +warning: Truncating game ID "FOUR!" to 4 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite] diff --git a/test/fix/gameid.err b/test/fix/gameid.err index 7bf2a80f..e0388e80 100644 --- a/test/fix/gameid.err +++ b/test/fix/gameid.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the manufacturer code +warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite] diff --git a/test/fix/global-large.err b/test/fix/global-large.err index 864663dc..1fe0f58c 100644 --- a/test/fix/global-large.err +++ b/test/fix/global-large.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the global checksum +warning: Overwrote a non-zero byte in the global checksum [-Woverwrite] diff --git a/test/fix/global-larger.err b/test/fix/global-larger.err index 864663dc..1fe0f58c 100644 --- a/test/fix/global-larger.err +++ b/test/fix/global-larger.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the global checksum +warning: Overwrote a non-zero byte in the global checksum [-Woverwrite] diff --git a/test/fix/global-trash.err b/test/fix/global-trash.err index 864663dc..1fe0f58c 100644 --- a/test/fix/global-trash.err +++ b/test/fix/global-trash.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the global checksum +warning: Overwrote a non-zero byte in the global checksum [-Woverwrite] diff --git a/test/fix/global.err b/test/fix/global.err index 864663dc..1fe0f58c 100644 --- a/test/fix/global.err +++ b/test/fix/global.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the global checksum +warning: Overwrote a non-zero byte in the global checksum [-Woverwrite] diff --git a/test/fix/header-edit.err b/test/fix/header-edit.err index 37fcdfb0..929b9159 100644 --- a/test/fix/header-edit.err +++ b/test/fix/header-edit.err @@ -1,4 +1,2 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the CGB flag -warning: [-Woverwrite] - Overwrote a non-zero byte in the header checksum +warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite] +warning: Overwrote a non-zero byte in the header checksum [-Woverwrite] diff --git a/test/fix/header-trash.err b/test/fix/header-trash.err index 87eb296e..4c0532b8 100644 --- a/test/fix/header-trash.err +++ b/test/fix/header-trash.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the header checksum +warning: Overwrote a non-zero byte in the header checksum [-Woverwrite] diff --git a/test/fix/header.err b/test/fix/header.err index 87eb296e..4c0532b8 100644 --- a/test/fix/header.err +++ b/test/fix/header.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the header checksum +warning: Overwrote a non-zero byte in the header checksum [-Woverwrite] diff --git a/test/fix/jp.err b/test/fix/jp.err index 91e61485..b450f7ac 100644 --- a/test/fix/jp.err +++ b/test/fix/jp.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the destination code +warning: Overwrote a non-zero byte in the destination code [-Woverwrite] diff --git a/test/fix/logo-trash.err b/test/fix/logo-trash.err index 4370b688..edc70b88 100644 --- a/test/fix/logo-trash.err +++ b/test/fix/logo-trash.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the Nintendo logo +warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite] diff --git a/test/fix/logo.err b/test/fix/logo.err index 4370b688..edc70b88 100644 --- a/test/fix/logo.err +++ b/test/fix/logo.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the Nintendo logo +warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite] diff --git a/test/fix/mbc-rom-ram-battery.err b/test/fix/mbc-rom-ram-battery.err index a43950c1..e358c3f0 100644 --- a/test/fix/mbc-rom-ram-battery.err +++ b/test/fix/mbc-rom-ram-battery.err @@ -1,2 +1 @@ -warning: [-Wmbc] - MBC "ROM+RAM+BATTERY" is under-specified and poorly supported +warning: MBC "ROM+RAM+BATTERY" is under-specified and poorly supported [-Wmbc] diff --git a/test/fix/mbc-rom-ram.err b/test/fix/mbc-rom-ram.err index d5a97246..3973ada1 100644 --- a/test/fix/mbc-rom-ram.err +++ b/test/fix/mbc-rom-ram.err @@ -1,2 +1 @@ -warning: [-Wmbc] - MBC "ROM+RAM" is under-specified and poorly supported +warning: MBC "ROM+RAM" is under-specified and poorly supported [-Wmbc] diff --git a/test/fix/mbc.err b/test/fix/mbc.err index 44fdfbcf..4b220d11 100644 --- a/test/fix/mbc.err +++ b/test/fix/mbc.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the cartridge type +warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite] diff --git a/test/fix/mbcless-ram.err b/test/fix/mbcless-ram.err index 97355468..7f074968 100644 --- a/test/fix/mbcless-ram.err +++ b/test/fix/mbcless-ram.err @@ -1,6 +1,3 @@ -warning: [-Wmbc] - MBC "ROM" has no RAM, but RAM size was set to 2 -warning: [-Woverwrite] - Overwrote a non-zero byte in the cartridge type -warning: [-Woverwrite] - Overwrote a non-zero byte in the RAM size +warning: MBC "ROM" has no RAM, but RAM size was set to 2 [-Wmbc] +warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite] +warning: Overwrote a non-zero byte in the RAM size [-Woverwrite] diff --git a/test/fix/new-lic-trunc.err b/test/fix/new-lic-trunc.err index a95cb81b..c712a248 100644 --- a/test/fix/new-lic-trunc.err +++ b/test/fix/new-lic-trunc.err @@ -1,4 +1,2 @@ -warning: [-Wtruncation] - Truncating new licensee "HOMEBREW" to 2 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the new licensee code +warning: Truncating new licensee "HOMEBREW" to 2 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the new licensee code [-Woverwrite] diff --git a/test/fix/new-lic.err b/test/fix/new-lic.err index 3eced6d6..5968a920 100644 --- a/test/fix/new-lic.err +++ b/test/fix/new-lic.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the new licensee code +warning: Overwrote a non-zero byte in the new licensee code [-Woverwrite] diff --git a/test/fix/old-lic-hex.err b/test/fix/old-lic-hex.err index 640f574a..bb98608b 100644 --- a/test/fix/old-lic-hex.err +++ b/test/fix/old-lic-hex.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the old licensee code +warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite] diff --git a/test/fix/old-lic.err b/test/fix/old-lic.err index 640f574a..bb98608b 100644 --- a/test/fix/old-lic.err +++ b/test/fix/old-lic.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the old licensee code +warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite] diff --git a/test/fix/ram.err b/test/fix/ram.err index 2aa4d105..9908bc4a 100644 --- a/test/fix/ram.err +++ b/test/fix/ram.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the RAM size +warning: Overwrote a non-zero byte in the RAM size [-Woverwrite] diff --git a/test/fix/ramful-mbc-no-ram.err b/test/fix/ramful-mbc-no-ram.err index 48823e44..3a0f4b23 100644 --- a/test/fix/ramful-mbc-no-ram.err +++ b/test/fix/ramful-mbc-no-ram.err @@ -1,6 +1,3 @@ -warning: [-Wmbc] - MBC "MBC3+RAM" has RAM, but RAM size was set to 0 -warning: [-Woverwrite] - Overwrote a non-zero byte in the cartridge type -warning: [-Woverwrite] - Overwrote a non-zero byte in the RAM size +warning: MBC "MBC3+RAM" has RAM, but RAM size was set to 0 [-Wmbc] +warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite] +warning: Overwrote a non-zero byte in the RAM size [-Woverwrite] diff --git a/test/fix/ramful-mbc.err b/test/fix/ramful-mbc.err index e8717e74..d7415c79 100644 --- a/test/fix/ramful-mbc.err +++ b/test/fix/ramful-mbc.err @@ -1,4 +1,2 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the cartridge type -warning: [-Woverwrite] - Overwrote a non-zero byte in the RAM size +warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite] +warning: Overwrote a non-zero byte in the RAM size [-Woverwrite] diff --git a/test/fix/ramless-mbc.err b/test/fix/ramless-mbc.err index e8717e74..d7415c79 100644 --- a/test/fix/ramless-mbc.err +++ b/test/fix/ramless-mbc.err @@ -1,4 +1,2 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the cartridge type -warning: [-Woverwrite] - Overwrote a non-zero byte in the RAM size +warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite] +warning: Overwrote a non-zero byte in the RAM size [-Woverwrite] diff --git a/test/fix/sgb-licensee.err b/test/fix/sgb-licensee.err index 338c869a..a338695b 100644 --- a/test/fix/sgb-licensee.err +++ b/test/fix/sgb-licensee.err @@ -1,6 +1,3 @@ -warning: [-Wsgb] - SGB compatibility enabled, but old licensee is 0x45, not 0x33 -warning: [-Woverwrite] - Overwrote a non-zero byte in the SGB flag -warning: [-Woverwrite] - Overwrote a non-zero byte in the old licensee code +warning: SGB compatibility enabled, but old licensee is 0x45, not 0x33 [-Wsgb] +warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite] +warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite] diff --git a/test/fix/sgb-old-licensee.err b/test/fix/sgb-old-licensee.err index e471519b..55b78f3d 100644 --- a/test/fix/sgb-old-licensee.err +++ b/test/fix/sgb-old-licensee.err @@ -1,4 +1,2 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the SGB flag -warning: [-Wsgb] - SGB compatibility enabled, but old licensee was 0xc5, not 0x33 +warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite] +warning: SGB compatibility enabled, but old licensee was 0xc5, not 0x33 [-Wsgb] diff --git a/test/fix/sgb.err b/test/fix/sgb.err index 314b763b..e1bcf98c 100644 --- a/test/fix/sgb.err +++ b/test/fix/sgb.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the SGB flag +warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite] diff --git a/test/fix/title-color-trunc-rev.err b/test/fix/title-color-trunc-rev.err index d49a95eb..dd555421 100644 --- a/test/fix/title-color-trunc-rev.err +++ b/test/fix/title-color-trunc-rev.err @@ -1,6 +1,3 @@ -warning: [-Wtruncation] - Truncating title "0123456789ABCDEF" to 15 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the title -warning: [-Woverwrite] - Overwrote a non-zero byte in the CGB flag +warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the title [-Woverwrite] +warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite] diff --git a/test/fix/title-color-trunc.err b/test/fix/title-color-trunc.err index d49a95eb..dd555421 100644 --- a/test/fix/title-color-trunc.err +++ b/test/fix/title-color-trunc.err @@ -1,6 +1,3 @@ -warning: [-Wtruncation] - Truncating title "0123456789ABCDEF" to 15 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the title -warning: [-Woverwrite] - Overwrote a non-zero byte in the CGB flag +warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the title [-Woverwrite] +warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite] diff --git a/test/fix/title-compat-trunc-rev.err b/test/fix/title-compat-trunc-rev.err index d49a95eb..dd555421 100644 --- a/test/fix/title-compat-trunc-rev.err +++ b/test/fix/title-compat-trunc-rev.err @@ -1,6 +1,3 @@ -warning: [-Wtruncation] - Truncating title "0123456789ABCDEF" to 15 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the title -warning: [-Woverwrite] - Overwrote a non-zero byte in the CGB flag +warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the title [-Woverwrite] +warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite] diff --git a/test/fix/title-compat-trunc.err b/test/fix/title-compat-trunc.err index d49a95eb..dd555421 100644 --- a/test/fix/title-compat-trunc.err +++ b/test/fix/title-compat-trunc.err @@ -1,6 +1,3 @@ -warning: [-Wtruncation] - Truncating title "0123456789ABCDEF" to 15 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the title -warning: [-Woverwrite] - Overwrote a non-zero byte in the CGB flag +warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the title [-Woverwrite] +warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite] diff --git a/test/fix/title-gameid-trunc-rev.err b/test/fix/title-gameid-trunc-rev.err index 4bc53864..a167527c 100644 --- a/test/fix/title-gameid-trunc-rev.err +++ b/test/fix/title-gameid-trunc-rev.err @@ -1,6 +1,3 @@ -warning: [-Wtruncation] - Truncating title "0123456789ABCDEF" to 11 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the title -warning: [-Woverwrite] - Overwrote a non-zero byte in the manufacturer code +warning: Truncating title "0123456789ABCDEF" to 11 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the title [-Woverwrite] +warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite] diff --git a/test/fix/title-gameid-trunc.err b/test/fix/title-gameid-trunc.err index 4bc53864..a167527c 100644 --- a/test/fix/title-gameid-trunc.err +++ b/test/fix/title-gameid-trunc.err @@ -1,6 +1,3 @@ -warning: [-Wtruncation] - Truncating title "0123456789ABCDEF" to 11 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the title -warning: [-Woverwrite] - Overwrote a non-zero byte in the manufacturer code +warning: Truncating title "0123456789ABCDEF" to 11 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the title [-Woverwrite] +warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite] diff --git a/test/fix/title-pad.err b/test/fix/title-pad.err index 2752acfd..2c7dbe06 100644 --- a/test/fix/title-pad.err +++ b/test/fix/title-pad.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the title +warning: Overwrote a non-zero byte in the title [-Woverwrite] diff --git a/test/fix/title-trunc.err b/test/fix/title-trunc.err index ffbccb0e..1d96d987 100644 --- a/test/fix/title-trunc.err +++ b/test/fix/title-trunc.err @@ -1,4 +1,2 @@ -warning: [-Wtruncation] - Truncating title "0123456789ABCDEFGHIJK" to 16 chars -warning: [-Woverwrite] - Overwrote a non-zero byte in the title +warning: Truncating title "0123456789ABCDEFGHIJK" to 16 chars [-Wtruncation] +warning: Overwrote a non-zero byte in the title [-Woverwrite] diff --git a/test/fix/title.err b/test/fix/title.err index 2752acfd..2c7dbe06 100644 --- a/test/fix/title.err +++ b/test/fix/title.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the title +warning: Overwrote a non-zero byte in the title [-Woverwrite] diff --git a/test/fix/tpp1-features.err b/test/fix/tpp1-features.err index e26c9886..a7994146 100644 --- a/test/fix/tpp1-features.err +++ b/test/fix/tpp1-features.err @@ -1,10 +1,5 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the cartridge type -warning: [-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 RAM size -warning: [-Woverwrite] - Overwrote a non-zero byte in the TPP1 feature flags +warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite] +warning: Overwrote a non-zero byte in the TPP1 identification code [-Woverwrite] +warning: Overwrote a non-zero byte in the TPP1 revision number [-Woverwrite] +warning: Overwrote a non-zero byte in the RAM size [-Woverwrite] +warning: Overwrote a non-zero byte in the TPP1 feature flags [-Woverwrite] diff --git a/test/fix/tpp1-nonjap.err b/test/fix/tpp1-nonjap.err index 0da253ce..658cc571 100644 --- a/test/fix/tpp1-nonjap.err +++ b/test/fix/tpp1-nonjap.err @@ -1,10 +1,5 @@ -warning: [-Wmbc] - TPP1 overwrites region flag for its identification code, ignoring `-j` -warning: [-Woverwrite] - Overwrote a non-zero byte in the cartridge type -warning: [-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 +warning: TPP1 overwrites region flag for its identification code, ignoring `-j` [-Wmbc] +warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite] +warning: Overwrote a non-zero byte in the TPP1 identification code [-Woverwrite] +warning: Overwrote a non-zero byte in the TPP1 revision number [-Woverwrite] +warning: Overwrote a non-zero byte in the TPP1 feature flags [-Woverwrite] diff --git a/test/fix/verify-pad.err b/test/fix/verify-pad.err index 48e7318e..540e8bc8 100644 --- a/test/fix/verify-pad.err +++ b/test/fix/verify-pad.err @@ -1,6 +1,3 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the Nintendo logo -warning: [-Woverwrite] - Overwrote a non-zero byte in the header checksum -warning: [-Woverwrite] - Overwrote a non-zero byte in the global checksum +warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite] +warning: Overwrote a non-zero byte in the header checksum [-Woverwrite] +warning: Overwrote a non-zero byte in the global checksum [-Woverwrite] diff --git a/test/fix/verify-trash.err b/test/fix/verify-trash.err index 48e7318e..540e8bc8 100644 --- a/test/fix/verify-trash.err +++ b/test/fix/verify-trash.err @@ -1,6 +1,3 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the Nintendo logo -warning: [-Woverwrite] - Overwrote a non-zero byte in the header checksum -warning: [-Woverwrite] - Overwrote a non-zero byte in the global checksum +warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite] +warning: Overwrote a non-zero byte in the header checksum [-Woverwrite] +warning: Overwrote a non-zero byte in the global checksum [-Woverwrite] diff --git a/test/fix/verify.err b/test/fix/verify.err index 48e7318e..540e8bc8 100644 --- a/test/fix/verify.err +++ b/test/fix/verify.err @@ -1,6 +1,3 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the Nintendo logo -warning: [-Woverwrite] - Overwrote a non-zero byte in the header checksum -warning: [-Woverwrite] - Overwrote a non-zero byte in the global checksum +warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite] +warning: Overwrote a non-zero byte in the header checksum [-Woverwrite] +warning: Overwrote a non-zero byte in the global checksum [-Woverwrite] diff --git a/test/fix/version.err b/test/fix/version.err index 1a8f2110..2d37a9ad 100644 --- a/test/fix/version.err +++ b/test/fix/version.err @@ -1,2 +1 @@ -warning: [-Woverwrite] - Overwrote a non-zero byte in the mask ROM version number +warning: Overwrote a non-zero byte in the mask ROM version number [-Woverwrite] diff --git a/test/gfx/warn_embedded.err b/test/gfx/warn_embedded.err index 0adb25a0..9d197208 100644 --- a/test/gfx/warn_embedded.err +++ b/test/gfx/warn_embedded.err @@ -1,3 +1,2 @@ -error: [-Werror=embedded] - Sorting palette colors by PNG's embedded PLTE chunk without '-c/--colors embedded' +error: Sorting palette colors by PNG's embedded PLTE chunk without '-c/--colors embedded' [-Werror=embedded] Conversion aborted after 1 error diff --git a/test/gfx/warn_trim_nonempty.err b/test/gfx/warn_trim_nonempty.err index e40ab0c5..d69b8db8 100644 --- a/test/gfx/warn_trim_nonempty.err +++ b/test/gfx/warn_trim_nonempty.err @@ -1,2 +1 @@ -warning: [-Wtrim-nonempty] - Trimming a nonempty tile (configure with '-x/--trim-end') +warning: Trimming a nonempty tile (configure with '-x/--trim-end') [-Wtrim-nonempty]