[binutils-gdb] Change tui_update_breakpoint_info to be a method

[Tom Tromey <tromey at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2ddaf614439b50e6019c5218f2fbfc0d14194e96

commit 2ddaf614439b50e6019c5218f2fbfc0d14194e96
Author: Tom Tromey <tom@tromey.com>
Date:   Thu Jul 11 18:27:02 2019 -0600

    Change tui_update_breakpoint_info to be a method
    
    This changes tui_update_breakpoint_info to be a method on
    tui_source_window_base.
    
    gdb/ChangeLog
    2019-08-16  Tom Tromey  <tom@tromey.com>
    
    	* tui/tui-winsource.h (struct tui_source_window_base)
    	<update_breakpoint_info>: Declare.
    	(tui_update_breakpoint_info): Don't declare.
    	* tui/tui-winsource.c (tui_source_window_base::update_source_window_as_is)
    	(tui_update_all_breakpoint_info): Update.
    	(tui_source_window_base::update_breakpoint_info): Rename from
    	tui_update_breakpoint_info.
    	(tui_source_window_base::update_exec_info): Update.

Diff:
---
 gdb/ChangeLog           | 11 +++++++++++
 gdb/tui/tui-winsource.c | 21 +++++++++------------
 gdb/tui/tui-winsource.h | 17 ++++++++---------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6f0344d..d6aecd2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,17 @@
 2019-08-16  Tom Tromey  <tom@tromey.com>
 
 	* tui/tui-winsource.h (struct tui_source_window_base)
+	<update_breakpoint_info>: Declare.
+	(tui_update_breakpoint_info): Don't declare.
+	* tui/tui-winsource.c (tui_source_window_base::update_source_window_as_is)
+	(tui_update_all_breakpoint_info): Update.
+	(tui_source_window_base::update_breakpoint_info): Rename from
+	tui_update_breakpoint_info.
+	(tui_source_window_base::update_exec_info): Update.
+
+2019-08-16  Tom Tromey  <tom@tromey.com>
+
+	* tui/tui-winsource.h (struct tui_source_window_base)
 	<update_source_window>: Declare.
 	(tui_update_source_window): Don't declare.
 	* tui/tui-winsource.c
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 3d1d6c4..d0e1879 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -99,7 +99,7 @@ tui_source_window_base::update_source_window_as_is
     erase_source_content ();
   else
     {
-      tui_update_breakpoint_info (this, nullptr, false);
+      update_breakpoint_info (nullptr, false);
       show_source_content ();
       update_exec_info ();
       if (type == SRC_WIN)
@@ -448,10 +448,8 @@ tui_update_all_breakpoint_info (struct breakpoint *being_deleted)
 {
   for (tui_source_window_base *win : tui_source_windows ())
     {
-      if (tui_update_breakpoint_info (win, being_deleted, false))
-        {
-          win->update_exec_info ();
-        }
+      if (win->update_breakpoint_info (being_deleted, false))
+	win->update_exec_info ();
     }
 }
 
@@ -463,20 +461,19 @@ tui_update_all_breakpoint_info (struct breakpoint *being_deleted)
    refreshed.  */
 
 bool
-tui_update_breakpoint_info (struct tui_source_window_base *win,
-			    struct breakpoint *being_deleted,
-			    bool current_only)
+tui_source_window_base::update_breakpoint_info
+  (struct breakpoint *being_deleted, bool current_only)
 {
   int i;
   bool need_refresh = false;
 
-  for (i = 0; i < win->content.size (); i++)
+  for (i = 0; i < content.size (); i++)
     {
       struct breakpoint *bp;
       extern struct breakpoint *breakpoint_chain;
       struct tui_source_element *line;
 
-      line = &win->content[i];
+      line = &content[i];
       if (current_only && !line->is_exec_point)
          continue;
 
@@ -498,7 +495,7 @@ tui_update_breakpoint_info (struct tui_source_window_base *win,
 
 	  for (loc = bp->loc; loc != NULL; loc = loc->next)
 	    {
-	      if (win->location_matches_p (loc, i))
+	      if (location_matches_p (loc, i))
 		{
 		  if (bp->enable_state == bp_disabled)
 		    mode |= TUI_BP_DISABLED;
@@ -529,7 +526,7 @@ void
 tui_source_window_base::update_exec_info ()
 {
   werase (execution_info->handle);
-  tui_update_breakpoint_info (this, nullptr, true);
+  update_breakpoint_info (nullptr, true);
   for (int i = 0; i < content.size (); i++)
     {
       struct tui_source_element *src_element = &content[i];
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 80608b5..30b29ca 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -142,6 +142,14 @@ public:
 			     struct symtab *s,
 			     struct tui_line_or_address line_or_addr);
 
+  /* Scan the source window and the breakpoints to update the
+     break_mode information for each line.  Returns true if something
+     changed and the execution window must be refreshed.  See
+     tui_update_all_breakpoint_info for a description of
+     BEING_DELETED.  */
+  bool update_breakpoint_info (struct breakpoint *being_deleted,
+			       bool current_only);
+
   /* Erase the source content.  */
   virtual void erase_source_content () = 0;
 
@@ -239,15 +247,6 @@ struct tui_source_windows
    removed from the list of breakpoints.  */
 extern void tui_update_all_breakpoint_info (struct breakpoint *being_deleted);
 
-/* Scan the source window and the breakpoints to update the break_mode
-   information for each line.  Returns true if something changed and
-   the execution window must be refreshed.  See
-   tui_update_all_breakpoint_info for a description of
-   BEING_DELETED.  */
-extern bool tui_update_breakpoint_info (struct tui_source_window_base *win,
-					struct breakpoint *being_deleted,
-					bool current_only);
-
 /* Function to display the "main" routine.  */
 extern void tui_display_main (void);
 extern void tui_update_source_windows_with_addr (struct gdbarch *, CORE_ADDR);