X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcomplaints.h;h=edb007fb97ccaddaa4551ce2b0c70d0babded017;hb=326b0c1289f97a25f3846f1d1d8d32811bbd1789;hp=0168b524195042605c058afc2eca795e844e1230;hpb=1ae18a04ceb5b3a60107113733587d22c7b3d9b3;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/complaints.h b/gdb/complaints.h
index 0168b52419..edb007fb97 100644
--- a/gdb/complaints.h
+++ b/gdb/complaints.h
@@ -1,13 +1,12 @@
 /* Definitions for complaint handling during symbol reading in GDB.
 
-   Copyright 1990, 1991, 1992, 1995, 1998, 2000, 2002 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,38 +15,34 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #if !defined (COMPLAINTS_H)
 #define COMPLAINTS_H
 
-/* Opaque object used to track the number of complaints of a
-   particular category.  */
-struct complaints;
-
-/* Predefined categories.  */
-extern struct complaints *symfile_complaints;
-
-/* Register a complaint.  */
-extern void complaint (struct complaints **complaints, const char *fmt,
-		       ...) ATTR_FORMAT (printf, 2, 3);
-extern void internal_complaint (struct complaints **complaints,
-				const char *file, int line, const char *fmt,
-				...) ATTR_FORMAT (printf, 4, 5);
+/* Helper for complaint.  */
+extern void complaint_internal (const char *fmt, ...)
+  ATTRIBUTE_PRINTF (1, 2);
+
+/* 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								\
+    {								\
+      extern int stop_whining;					\
+								\
+      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) */