Remove struct complaints

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-23  Tom Tromey  <tom@tromey.com>

	* complaints.c (struct complaints): Remove.
	(symfile_complaint_book): Remove.
	(series): New global.
	(complaint_internal): Update.
	(clear_complaints): Update.
This commit is contained in:
Tom Tromey 2018-05-16 23:25:09 -06:00
parent ff1cf532db
commit a8be540e8a
2 changed files with 12 additions and 11 deletions

View File

@ -1,3 +1,11 @@
2018-05-23 Tom Tromey <tom@tromey.com>
* complaints.c (struct complaints): Remove.
(symfile_complaint_book): Remove.
(series): New global.
(complaint_internal): Update.
(clear_complaints): Update.
2018-05-23 Tom Tromey <tom@tromey.com>
* complaints.c (counters): New global.

View File

@ -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