X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcomplaints.h;h=6ad056d257efa79d3040db600c158debcecdd7ef;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=5d280942dc41b2a3db545f7d4c8725365ebc56a4;hpb=28e7fd62340426746f9c896cbc40c5d374ec47aa;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/complaints.h b/gdb/complaints.h
index 5d280942dc..6ad056d257 100644
--- a/gdb/complaints.h
+++ b/gdb/complaints.h
@@ -1,6 +1,6 @@
 /* Definitions for complaint handling during symbol reading in GDB.
 
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,32 +21,30 @@
 #if !defined (COMPLAINTS_H)
 #define COMPLAINTS_H
 
-/* Opaque object used to track the number of complaints of a
-   particular category.  */
-struct complaints;
+/* Helper for complaint.  */
+extern void complaint_internal (const char *fmt, ...)
+  ATTRIBUTE_PRINTF (1, 2);
 
-/* Predefined categories.  */
-extern struct complaints *symfile_complaints;
+/* This controls whether complaints are emitted.  */
 
-/* Register a complaint.  */
-extern void complaint (struct complaints **complaints,
-		       const char *fmt,
-		       ...) ATTRIBUTE_PRINTF (2, 3);
-extern void internal_complaint (struct complaints **complaints,
-				const char *file, int line,
-				const char *fmt,
-				...) ATTRIBUTE_PRINTF (4, 5);
+extern int stop_whining;
+
+/* Register a complaint.  This is a macro around complaint_internal to
+   avoid computing complaint's arguments when complaints are disabled.
+   Running FMT via gettext [i.e., _(FMT)] can be quite expensive, for
+   example.  */
+#define complaint(FMT, ...)					\
+  do								\
+    {								\
+      if (stop_whining > 0)					\
+	complaint_internal (FMT, ##__VA_ARGS__);		\
+    }								\
+  while (0)
 
 /* Clear out / initialize all complaint counters that have ever been
-   incremented.  If LESS_VERBOSE is 1, be less verbose about
-   successive complaints, since the messages are appearing all
-   together during a command that is reporting a contiguous block of
-   complaints (rather than being interleaved with other messages).  If
-   noisy is 1, we are in a noisy command, and our caller will print
-   enough context for the user to figure it out.  */
-
-extern void clear_complaints (struct complaints **complaints,
-			      int less_verbose, int noisy);
+   incremented.  */
+
+extern void clear_complaints ();
 
 
 #endif /* !defined (COMPLAINTS_H) */