From patchwork Thu Dec 12 17:51:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36784 Received: (qmail 2120 invoked by alias); 12 Dec 2019 17:51:31 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 2068 invoked by uid 89); 12 Dec 2019 17:51:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Dec 2019 17:51:29 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 791EA204A1; Thu, 12 Dec 2019 12:51:27 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 28D54204A8 for ; Thu, 12 Dec 2019 12:51:19 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 1DFB320AF6 for ; Thu, 12 Dec 2019 12:51:19 -0500 (EST) X-Gerrit-PatchSet: 1 Date: Thu, 12 Dec 2019 12:51:19 -0500 From: "Tom Tromey (Code Review)" To: gdb-patches@sourceware.org Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: [review] Remove ARI check for multiple calls to warning or error X-Gerrit-Change-Id: I0618683623a3c7324460c7b9e5d7f252d88c2e8d X-Gerrit-Change-Number: 756 X-Gerrit-ChangeURL: X-Gerrit-Commit: 3a8ba1d1decfd2216517a813aa986ce4f9a84461 References: Reply-To: tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/756 ...................................................................... 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, 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-12 Tom Tromey * contrib/ari/gdb_ari.sh: Remove check for multiple calls to warning or error. Change-Id: I0618683623a3c7324460c7b9e5d7f252d88c2e8d --- M gdb/ChangeLog M gdb/contrib/ari/gdb_ari.sh 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2911956..3453b07 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-12-12 Tom Tromey + * contrib/ari/gdb_ari.sh: Remove check for multiple calls to + warning or error. + +2019-12-12 Tom Tromey + * contrib/ari/gdb_ari.sh: Remove call to "fix" for "long long". 2019-12-05 Tom Tromey diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh index 5f05890..3ed9116 100755 --- a/gdb/contrib/ari/gdb_ari.sh +++ b/gdb/contrib/ari/gdb_ari.sh @@ -619,21 +619,6 @@ # 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; \