This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA 6/9] Remove vcomplaint
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Mon, 21 May 2018 23:07:01 -0600
- Subject: [RFA 6/9] Remove vcomplaint
- References: <20180522050704.10845-1-tom@tromey.com>
vcomplaint now has a single caller, so merge it with that caller.
gdb/ChangeLog
2018-05-21 Tom Tromey <tom@tromey.com>
* complaints.c (vcomplaint): Remove.
(complaint_internal) Merge in contents of vcomplaint.
---
gdb/ChangeLog | 5 +++++
gdb/complaints.c | 25 ++++++++-----------------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/gdb/complaints.c b/gdb/complaints.c
index eab7607deb..4b7532582f 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -100,22 +100,22 @@ find_complaint (struct complaints *complaints, const char *file,
int stop_whining = 0;
-/* Print a complaint, and link the complaint block into a chain for
- later handling. */
+/* See complaints.h. */
-static void ATTRIBUTE_PRINTF (3, 0)
-vcomplaint (const char *file,
- int line, const char *fmt,
- va_list args)
+void
+complaint_internal (const char *fmt, ...)
{
- struct complain *complaint = find_complaint (&symfile_complaint_book, file,
- line, fmt);
+ va_list args;
+
+ struct complain *complaint = find_complaint (&symfile_complaint_book, NULL,
+ 0, fmt);
enum complaint_series series;
complaint->counter++;
if (complaint->counter > stop_whining)
return;
+ va_start (args, fmt);
series = symfile_complaint_book.series;
/* Pass 'fmt' instead of 'complaint->fmt' to printf-like callees
@@ -146,15 +146,6 @@ vcomplaint (const char *file,
becomes a performance hog. */
gdb_flush (gdb_stderr);
-}
-
-void
-complaint_internal (const char *fmt, ...)
-{
- va_list args;
-
- va_start (args, fmt);
- vcomplaint (NULL/*file*/, 0/*line*/, fmt, args);
va_end (args);
}
--
2.13.6