From 234c306803e0b3c423b3935562a029f3bad04482 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 12 Dec 2019 10:40:08 -0700 Subject: [PATCH] Remove ARI check for multiple calls to warning or error ARI has a check for multiple calls to warning or error, suggesting that they be combined into a single call. This triggers at three places in gdb -- throw_bad_regnum_error, guile_repl_command, and the end of value_cast -- and after examining these, I think they all make sense as-is. Instead, it makes sense to remove this check from ARI. gdb/ChangeLog 2019-12-13 Tom Tromey * contrib/ari/gdb_ari.sh: Remove check for multiple calls to warning or error. Change-Id: I0618683623a3c7324460c7b9e5d7f252d88c2e8d --- gdb/ChangeLog | 5 +++++ gdb/contrib/ari/gdb_ari.sh | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 90c3742e93..7d4f982761 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-12-13 Tom Tromey + + * contrib/ari/gdb_ari.sh: Remove check for multiple calls to + warning or error. + 2019-12-13 Tom Tromey * contrib/ari/gdb_ari.sh: Remove call to "fix" for "long long". diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh index 5f058906d0..3ed911685d 100755 --- a/gdb/contrib/ari/gdb_ari.sh +++ b/gdb/contrib/ari/gdb_ari.sh @@ -619,21 +619,6 @@ Do not use NORETURN, use ATTRIBUTE_NORETURN instead" # General problems -BEGIN { doc["multiple messages"] = "\ -Do not use multiple calls to warning or error, instead use a single call" - category["multiple messages"] = ari_gettext -} -FNR == 1 { - warning_fnr = -1 -} -/(^|[^_[:alnum:]])(warning|error)[[:space:]]*\(/ { - if (FNR == warning_fnr + 1) { - fail("multiple messages") - } else { - warning_fnr = FNR - } -} - # Commented out, but left inside sources, just in case. # BEGIN { doc["inline"] = "\ # Do not use the inline attribute; \ -- 2.34.1