[RFA,3/9] Remove "noisy" parameter from clear_complaints

Message ID 20180522050704.10845-4-tom@tromey.com
State New
Headers show
Series
  • Radically simplify the complaint system
Related show

Commit Message

Tom Tromey May 22, 2018, 5:06 a.m.
After the previous patch, the "noisy" parameter to clear_complaints is
no longer used, so this patch removes it.

gdb/ChangeLog
2018-05-21  Tom Tromey  <tom@tromey.com>

	* complaints.c (clear_complaints): Remove "noisy" parameter.
	* complaints.h (clear_complaints): Update.
	* symfile.c (syms_from_objfile_1, finish_new_objfile)
	(reread_symbols): Update.

gdb/testsuite/ChangeLog
2018-05-21  Tom Tromey  <tom@tromey.com>

	* gdb.gdb/complaints.exp (test_empty_complaints): Update.
---
 gdb/ChangeLog                        |  7 +++++++
 gdb/complaints.c                     |  6 ++----
 gdb/complaints.h                     |  2 +-
 gdb/symfile.c                        |  8 ++++----
 gdb/testsuite/ChangeLog              |  4 ++++
 gdb/testsuite/gdb.gdb/complaints.exp | 14 +++++---------
 6 files changed, 23 insertions(+), 18 deletions(-)

-- 
2.13.6

Patch

diff --git a/gdb/complaints.c b/gdb/complaints.c
index 71d36e6326..d29b3c7830 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -220,12 +220,10 @@  complaint_internal (struct complaints **complaints, const char *fmt, ...)
    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.  */
+   complaints (rather than being interleaved with other messages).  */
 
 void
-clear_complaints (struct complaints **c, int less_verbose, int noisy)
+clear_complaints (struct complaints **c, int less_verbose)
 {
   struct complaints *complaints = get_complaints (c);
   struct complain *p;
diff --git a/gdb/complaints.h b/gdb/complaints.h
index 37648fb525..652827e47b 100644
--- a/gdb/complaints.h
+++ b/gdb/complaints.h
@@ -56,7 +56,7 @@  extern void complaint_internal (struct complaints **complaints,
    enough context for the user to figure it out.  */
 
 extern void clear_complaints (struct complaints **complaints,
-			      int less_verbose, int noisy);
+			      int less_verbose);
 
 
 #endif /* !defined (COMPLAINTS_H) */
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 7bc03fbb8f..e48089a130 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -986,7 +986,7 @@  syms_from_objfile_1 (struct objfile *objfile,
      initial symbol reading for this file.  */
 
   (*objfile->sf->sym_init) (objfile);
-  clear_complaints (&symfile_complaints, 1, add_flags & SYMFILE_VERBOSE);
+  clear_complaints (&symfile_complaints, 1);
 
   (*objfile->sf->sym_offsets) (objfile, *addrs);
 
@@ -1033,7 +1033,7 @@  finish_new_objfile (struct objfile *objfile, symfile_add_flags add_flags)
     }
 
   /* We're done reading the symbol file; finish off complaints.  */
-  clear_complaints (&symfile_complaints, 0, add_flags & SYMFILE_VERBOSE);
+  clear_complaints (&symfile_complaints, 0);
 }
 
 /* Process a symbol file, as either the main file or as a dynamically
@@ -2457,7 +2457,7 @@  reread_symbols (void)
 	    }
 
 	  (*objfile->sf->sym_init) (objfile);
-	  clear_complaints (&symfile_complaints, 1, 1);
+	  clear_complaints (&symfile_complaints, 1);
 
 	  objfile->flags &= ~OBJF_PSYMTABS_READ;
 
@@ -2487,7 +2487,7 @@  reread_symbols (void)
 	    }
 
 	  /* We're done reading the symbol file; finish off complaints.  */
-	  clear_complaints (&symfile_complaints, 0, 1);
+	  clear_complaints (&symfile_complaints, 0);
 
 	  /* Getting new symbols may change our opinion about what is
 	     frameless.  */
diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp
index 1d532b7fd6..774ff89ae6 100644
--- a/gdb/testsuite/gdb.gdb/complaints.exp
+++ b/gdb/testsuite/gdb.gdb/complaints.exp
@@ -88,7 +88,7 @@  proc test_initial_complaints { } {
 # For short complaints, all are the same
 
 proc test_short_complaints { } {
-    gdb_test_exact "call clear_complaints (&symfile_complaints, 1, 1)" "" "short start"
+    gdb_test_exact "call clear_complaints (&symfile_complaints, 1)" "" "short start"
 
     # Prime the system
     test_complaint \
@@ -131,14 +131,10 @@  proc test_empty_complaint { cmd msg } {
 
 proc test_empty_complaints { } {
 
-    test_empty_complaint "call clear_complaints(&symfile_complaints,0,0)" \
-	    "empty non-verbose non-noisy clear"
-    test_empty_complaint "call clear_complaints(&symfile_complaints,1,0)" \
-	    "empty verbose non-noisy clear"
-    test_empty_complaint "call clear_complaints(&symfile_complaints,1,1)" \
-	    "empty verbose noisy clear"
-    test_empty_complaint "call clear_complaints(&symfile_complaints,0,1)" \
-	    "empty non-verbose noisy clear"
+    test_empty_complaint "call clear_complaints(&symfile_complaints,0)" \
+	    "empty non-verbose clear"
+    test_empty_complaint "call clear_complaints(&symfile_complaints,1)" \
+	    "empty verbose clear"
 
     return 0
 }