From patchwork Thu Aug 6 16:03:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 8049 Received: (qmail 108829 invoked by alias); 6 Aug 2015 16:03:34 -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 108804 invoked by uid 89); 6 Aug 2015 16:03:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg21.ericsson.net Received: from usevmg21.ericsson.net (HELO usevmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 06 Aug 2015 16:03:22 +0000 Received: from EUSAAHC005.ericsson.se (Unknown_Domain [147.117.188.87]) by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id 57.85.00712.67C13C55; Thu, 6 Aug 2015 10:36:06 +0200 (CEST) Received: from [142.133.110.144] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.89) with Microsoft SMTP Server id 14.3.210.2; Thu, 6 Aug 2015 12:03:19 -0400 Message-ID: <55C38547.9000009@ericsson.com> Date: Thu, 6 Aug 2015 12:03:19 -0400 From: Simon Marchi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Pedro Alves , Subject: Re: [PATCH] Change type of struct complaints::series References: <1438811079-25809-1-git-send-email-simon.marchi@ericsson.com> <55C3192D.8070007@redhat.com> In-Reply-To: <55C3192D.8070007@redhat.com> X-IsSubscribed: yes On 15-08-06 04:22 AM, Pedro Alves wrote: > On 08/05/2015 10:44 PM, Simon Marchi wrote: >> Found while processing the C++ enum changes. It seems like series >> should be of type enum complaint_series, instead of adding a cast. >> >> If somebody could guide me a little bit, I think I could clean up the >> comments around this. The comments on enum complaint_series and the >> series field seem redundant and maybe out of date. Do the "case N" in >> the comments refer to the enum values? If so they don't seem to match >> the actual values. > > 'git blame' is your friend. :-) Seems to me they do refer to > the enum values -- see b9caf505. That commit added the enum, and moved around > the "case N" comments. But, it also added a fourth state, and missed updating > the N numbers to account for it. E.g., "case 2: Subsequent message" is a typo > that should say "case 3". Definitely agreed that all these comments > are redundant. > >> >> gdb/ChangeLog: >> >> * complaints.c (enum complaint_series): Add newlines. >> (struct complaints) : Change type to enum >> complaint_series. >> (symfile_complaint_hook): Use equivalent enum value >> ISOLATED_MESSAGE instead of 0. > > This is OK. > > Thanks, > Pedro Alves Thanks, pushed with some comment cleanup. What I removed is redundant with the comments above each enum value. From 05d999b0896ab6ccd4ce23a715765484c60a967d Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 6 Aug 2015 12:01:05 -0400 Subject: [PATCH] Change type of struct complaints::series Found while processing the C++ enum changes. It seems like series should be of type enum complaint_series, instead of adding a cast. Redundant and out of date comments are also removed. gdb/ChangeLog: * complaints.c (enum complaint_series): Add newlines and remove out of date comment. (struct complaints) : Change type to enum complaint_series and remove out of date comment. (symfile_complaint_hook): Use equivalent enum value ISOLATED_MESSAGE instead of 0. --- gdb/ChangeLog | 9 +++++++++ gdb/complaints.c | 17 +++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 193581f..6c854ac 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2015-08-06 Simon Marchi + + * complaints.c (enum complaint_series): Add newlines and remove + out of date comment. + (struct complaints) : Change type to enum + complaint_series and remove out of date comment. + (symfile_complaint_hook): Use equivalent enum value + ISOLATED_MESSAGE instead of 0. + 2015-08-06 Pedro Alves * nat/linux-waitpid.c (my_waitpid): Only print *status if waitpid diff --git a/gdb/complaints.c b/gdb/complaints.c index dbacb2a..b696181 100644 --- a/gdb/complaints.c +++ b/gdb/complaints.c @@ -27,18 +27,17 @@ extern void _initialize_complaints (void); /* Should each complaint message be self explanatory, or should we assume that a series of complaints is being produced? */ -/* case 1: First message of a series that must - start off with explanation. case 2: Subsequent message of a series - that needs no explanation (the user already knows we have a problem - so we can just state our piece). */ enum complaint_series { /* Isolated self explanatory message. */ ISOLATED_MESSAGE, + /* First message of a series, includes an explanation. */ FIRST_MESSAGE, + /* First message of a series, but does not need to include any sort of explanation. */ SHORT_FIRST_MESSAGE, + /* Subsequent message of a series that needs no explanation (the user already knows we have a problem so we can just state our piece). */ @@ -69,13 +68,7 @@ struct complaints { struct complain *root; - /* Should each complaint be self explanatory, or should we assume - that a series of complaints is being produced? case 0: Isolated - self explanatory message. case 1: First message of a series that - must start off with explanation. case 2: Subsequent message of a - series that needs no explanation (the user already knows we have - a problem so we can just state our piece). */ - int series; + enum complaint_series series; /* The explanatory messages that should accompany the complaint. NOTE: cagney/2002-08-14: In a desperate attempt at being vaguely @@ -99,7 +92,7 @@ static struct explanation symfile_explanations[] = { static struct complaints symfile_complaint_book = { &complaint_sentinel, - 0, + ISOLATED_MESSAGE, symfile_explanations }; struct complaints *symfile_complaints = &symfile_complaint_book;