Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 9/9] Remove struct complaints
Date: Tue, 22 May 2018 05:07:00 -0000	[thread overview]
Message-ID: <20180522050704.10845-10-tom@tromey.com> (raw)
In-Reply-To: <20180522050704.10845-1-tom@tromey.com>

struct complaints now just holds a single enum value, so remove it and
symfile_complaint_book and replace it with a global variable.

gdb/ChangeLog
2018-05-21  Tom Tromey  <tom@tromey.com>

	* complaints.c (struct complaints): Remove.
	(symfile_complaint_book): Remove.
	(series): New global.
	(complaint_internal): Update.
	(clear_complaints): Update.
---
 gdb/ChangeLog    |  8 ++++++++
 gdb/complaints.c | 15 ++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/gdb/complaints.c b/gdb/complaints.c
index 2c69b8ca2c..1bf99d40f0 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -39,14 +39,9 @@ enum complaint_series {
 
 static std::unordered_map<const char *, int> counters;
 
-struct complaints
-{
-  enum complaint_series series;
-};
+/* How to print the next complaint.  */
 
-static struct complaints symfile_complaint_book = {
-  ISOLATED_MESSAGE
-};
+static complaint_series series;
 
 /* How many complaints about a particular thing should be printed
    before we stop whining about it?  Default is no whining at all,
@@ -60,13 +55,11 @@ void
 complaint_internal (const char *fmt, ...)
 {
   va_list args;
-  enum complaint_series series;
 
   if (counters[fmt]++ > stop_whining)
     return;
 
   va_start (args, fmt);
-  series = symfile_complaint_book.series;
 
   if (deprecated_warning_hook)
     (*deprecated_warning_hook) (fmt, args);
@@ -104,9 +97,9 @@ clear_complaints (int less_verbose)
   counters.clear ();
 
   if (!less_verbose)
-    symfile_complaint_book.series = ISOLATED_MESSAGE;
+    series = ISOLATED_MESSAGE;
   else
-    symfile_complaint_book.series = SHORT_FIRST_MESSAGE;
+    series = SHORT_FIRST_MESSAGE;
 }
 
 static void
-- 
2.13.6


  parent reply	other threads:[~2018-05-22  5:07 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-22  5:09 [RFA 0/9] Radically simplify the complaint system Tom Tromey
2018-05-22  5:07 ` [RFA 2/9] Remove elements from complaint_series Tom Tromey
2018-05-22  5:07 ` Tom Tromey [this message]
2018-05-22  5:08 ` [RFA 6/9] Remove vcomplaint Tom Tromey
2018-05-22  5:08 ` [RFA 5/9] Remove struct explanation Tom Tromey
2018-05-22  5:09 ` [RFA 8/9] Remove struct complain Tom Tromey
2018-05-22  5:09 ` [RFA 4/9] Remove symfile_complaints Tom Tromey
2018-05-22  5:09 ` [RFA 1/9] Remove internal_complaint Tom Tromey
2018-05-22  5:50 ` [RFA 3/9] Remove "noisy" parameter from clear_complaints Tom Tromey
2018-05-22  7:01 ` [RFA 7/9] Remove file and line from struct complain Tom Tromey
2018-05-23 14:49 ` [RFA 0/9] Radically simplify the complaint system Pedro Alves
2018-05-23 15:08   ` Tom Tromey
2018-05-23 17:44     ` Pedro Alves
2018-05-28 10:41       ` Tom Tromey
2018-05-28 10:41         ` Tom Tromey
2018-05-28 19:37         ` Pedro Alves
2018-05-28 22:19           ` Tom Tromey
2018-05-29 16:05             ` Pedro Alves
2018-06-04 20:25 ` Possible regression on gdb.gdb/complaints.exp (was: Re: [RFA 0/9] Radically simplify the complaint system) Sergio Durigan Junior
2018-06-04 21:38   ` Possible regression on gdb.gdb/complaints.exp Tom Tromey
2018-06-04 23:29     ` Sergio Durigan Junior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180522050704.10845-10-tom@tromey.com \
    --to=tom@tromey.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox