From de54e1a5d231c5857e870acc788f9b843ff5f050 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 16 May 2018 23:10:51 -0600 Subject: [PATCH] Remove vcomplaint vcomplaint now has a single caller, so merge it with that caller. gdb/ChangeLog 2018-05-23 Tom Tromey * 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/ChangeLog b/gdb/ChangeLog index 350e085129d..08b5f2327f3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-05-23 Tom Tromey + + * complaints.c (vcomplaint): Remove. + (complaint_internal) Merge in contents of vcomplaint. + 2018-05-23 Tom Tromey * complaints.c (struct complaints) : Remove. diff --git a/gdb/complaints.c b/gdb/complaints.c index 80b9595d187..4b7532582fd 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.30.2