From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 7/9] Remove file and line from struct complain
Date: Tue, 22 May 2018 07:01:00 -0000 [thread overview]
Message-ID: <20180522050704.10845-8-tom@tromey.com> (raw)
In-Reply-To: <20180522050704.10845-1-tom@tromey.com>
The file and line handling in complaints.c wasn't used once
internal_complaint was removed. This patch removes all the related
code.
gdb/ChangeLog
2018-05-21 Tom Tromey <tom@tromey.com>
* complaints.c (struct complain) <file, line>: Remove.
(find_complaint): Remove file, line parameters.
(complaint_internal): Update.
---
gdb/ChangeLog | 6 ++++++
gdb/complaints.c | 20 +++++---------------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/gdb/complaints.c b/gdb/complaints.c
index 4b7532582f..851d8f5d6f 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -38,8 +38,6 @@ enum complaint_series {
struct complain
{
- const char *file;
- int line;
const char *fmt;
int counter;
struct complain *next;
@@ -59,9 +57,8 @@ static struct complaints symfile_complaint_book = {
ISOLATED_MESSAGE
};
-static struct complain * ATTRIBUTE_PRINTF (4, 0)
-find_complaint (struct complaints *complaints, const char *file,
- int line, const char *fmt)
+static struct complain * ATTRIBUTE_PRINTF (2, 0)
+find_complaint (struct complaints *complaints, const char *fmt)
{
struct complain *complaint;
@@ -73,17 +70,13 @@ find_complaint (struct complaints *complaints, const char *file,
complaint != NULL;
complaint = complaint->next)
{
- if (complaint->fmt == fmt
- && complaint->file == file
- && complaint->line == line)
+ if (complaint->fmt == fmt)
return complaint;
}
/* Oops not seen before, fill in a new complaint. */
complaint = XNEW (struct complain);
complaint->fmt = fmt;
- complaint->file = file;
- complaint->line = line;
complaint->counter = 0;
complaint->next = NULL;
@@ -107,8 +100,7 @@ complaint_internal (const char *fmt, ...)
{
va_list args;
- struct complain *complaint = find_complaint (&symfile_complaint_book, NULL,
- 0, fmt);
+ struct complain *complaint = find_complaint (&symfile_complaint_book, fmt);
enum complaint_series series;
complaint->counter++;
@@ -125,9 +117,7 @@ complaint_internal (const char *fmt, ...)
string somewhere up the call chain. */
gdb_assert (complaint->fmt == fmt);
- if (complaint->file != NULL)
- internal_vwarning (complaint->file, complaint->line, fmt, args);
- else if (deprecated_warning_hook)
+ if (deprecated_warning_hook)
(*deprecated_warning_hook) (fmt, args);
else
{
--
2.13.6
next prev parent reply other threads:[~2018-05-22 5:09 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 9/9] Remove struct complaints Tom Tromey
2018-05-22 5:07 ` [RFA 2/9] Remove elements from complaint_series Tom Tromey
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 4/9] Remove symfile_complaints Tom Tromey
2018-05-22 5:09 ` [RFA 8/9] Remove struct complain 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 ` Tom Tromey [this message]
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-8-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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).