From d2a85f11be4db16c760d94e182e83cc0c9aa85e8 Mon Sep 17 00:00:00 2001
From: Jean Marie Diaz <ambar@cygnus>
Date: Tue, 2 Aug 1994 00:44:24 +0000
Subject: [PATCH] 	* breakpoint.c (mention), main.c (fputs_unfiltered):
 Add comments. 	* breakpoint.c (delete_breakpoint, enable_breakpoint, 
 disable_breakpoint): Don't call breakpoints_changed; it is now 	called
 via the *_breakpoint_hook functions. 	* annotate.c (_initialize_annotate,
 breakpoint_changed): New functions.

---
 gdb/ChangeLog    |  8 ++++++++
 gdb/annotate.c   | 18 ++++++++++++++++++
 gdb/breakpoint.c | 10 +++++-----
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8c6aa1f6f4b..29bd76dd781 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug  1 16:43:24 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* breakpoint.c (mention), main.c (fputs_unfiltered): Add comments.
+	* breakpoint.c (delete_breakpoint, enable_breakpoint,
+	disable_breakpoint): Don't call breakpoints_changed; it is now
+	called via the *_breakpoint_hook functions.
+	* annotate.c (_initialize_annotate, breakpoint_changed): New functions.
+
 Mon Aug  1 13:38:04 1994  Kung Hsu  (kung@mexican.cygnus.com)
 
 	* stabsread.c (read_type): Fix a bug in enum size calculation.
diff --git a/gdb/annotate.c b/gdb/annotate.c
index 0a73fb5dcd4..45009238edd 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "value.h"
 #include "target.h"
 #include "gdbtypes.h"
+#include "breakpoint.h"
 
 static void print_value_flags PARAMS ((struct type *));
 
@@ -519,3 +520,20 @@ annotate_array_section_end ()
     printf_filtered ("\n\032\032array-section-end\n");
 }
 
+static void
+breakpoint_changed (b)
+     struct breakpoint *b;
+{
+  breakpoints_changed ();
+}
+
+void
+_initialize_annotate ()
+{
+  if (annotation_level > 1)
+    {
+      delete_breakpoint_hook = breakpoint_changed;
+      enable_breakpoint_hook = breakpoint_changed;
+      disable_breakpoint_hook = breakpoint_changed;
+    }
+}
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index a23afd442f2..9a1aba5b155 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2149,6 +2149,11 @@ mention (b)
 {
   int say_where = 0;
 
+  /* FIXME: This is misplaced; mention() is called by things (like hitting a
+     watchpoint) other than breakpoint creation.  It should be possible to
+     clean this up and at the same time replace the random calls to
+     breakpoint_changed with this hook, as has already been done for
+     delete_breakpoint_hook and so on.  */
   if (create_breakpoint_hook)
     create_breakpoint_hook (b);
 
@@ -3238,8 +3243,6 @@ delete_breakpoint (bpt)
   if (bpt->source_file != NULL)
     free (bpt->source_file);
 
-  breakpoints_changed ();
-
   /* Be sure no bpstat's are pointing at it after it's been freed.  */
   /* FIXME, how can we find all bpstat's?
      We just check stop_bpstat for now.  */
@@ -3560,7 +3563,6 @@ enable_breakpoint (bpt)
         error ("Hardware breakpoints used exceeds limit.");
     }
   bpt->enable = enabled;
-  breakpoints_changed ();
   check_duplicates (bpt->address);
 
   if (bpt->type == bp_watchpoint || bpt->type == bp_hardware_watchpoint ||
@@ -3658,8 +3660,6 @@ disable_breakpoint (bpt)
 
   bpt->enable = disabled;
 
-  breakpoints_changed ();
-
   check_duplicates (bpt->address);
 }
 
-- 
2.30.2