diff mbox

[RFA,61/67] Constify some commands in breakpoint.c

Message ID 20170921051023.19023-62-tom@tromey.com
State New, archived
Headers

Commit Message

Tom Tromey Sept. 21, 2017, 5:10 a.m. UTC 
  This also makes delete_command static; but now I wonder if it is used
in Insight and should not be touched.

ChangeLog
2017-09-20  Tom Tromey  <tom@tromey.com>

	* breakpoint.h (delete_command): Don't declare.
	* breakpoint.c (delete_command, enable_once_command)
	(enable_count_command, enable_delete_command, breakpoint_1)
	(maintenance_info_breakpoints, stopin_command, stopat_command)
	(delete_command, delete_trace_command, save_breakpoints)
	(save_breakpoints_command, save_tracepoints_command): Constify.
---
 gdb/ChangeLog    |  9 +++++++++
 gdb/breakpoint.c | 45 ++++++++++++++-------------------------------
 gdb/breakpoint.h |  4 ----
 3 files changed, 23 insertions(+), 35 deletions(-)

Comments

Pedro Alves Sept. 21, 2017, 9:56 a.m. UTC | #1 
On 09/21/2017 06:10 AM, Tom Tromey wrote:
> This also makes delete_command static; but now I wonder if it is used
> in Insight and should not be touched.

[Adding Patrick]

Insight git is on sourceware nowadays:
  git://sourceware.org/git/insight.git

$ git grep delete_command
...
gdbtk/generic/gdbtk-cmds.c:  delete_command (NULL, 0);

I guess it'd be mildly nicer to add some "void delete_all_breakpoints();"
API instead of abusing the command callback.

Thanks,
Pedro Alves
Patrick Monnerat Sept. 21, 2017, 1:19 p.m. UTC | #2 
On 09/21/2017 10:56 AM, Pedro Alves wrote:
> On 09/21/2017 06:10 AM, Tom Tromey wrote:
>> This also makes delete_command static; but now I wonder if it is used
>> in Insight and should not be touched.
> ..
> gdbtk/generic/gdbtk-cmds.c:  delete_command (NULL, 0);
>
> I guess it'd be mildly nicer to add some "void delete_all_breakpoints();"
> API instead of abusing the command callback.
>
I've just added such an API to the insight code:
https://sourceware.org/git/?p=insight.git;a=commit;h=7dc503fbf209ec7f39771c2bf5e45e01974f18c5
It works fine without calling delete_command(). Thus it's OK for me to 
have static delete_command().

@palves: many thanks for having raised the flag before commit.

Patrick
diff mbox

Patch

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 1073418..59cb354 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -94,12 +94,6 @@  enum exception_event_kind
 
 /* Prototypes for local functions.  */
 
-static void enable_delete_command (char *, int);
-
-static void enable_once_command (char *, int);
-
-static void enable_count_command (char *, int);
-
 static void disable_command (char *, int);
 
 static void enable_command (char *, int);
@@ -184,9 +178,6 @@  static void info_breakpoints_command (char *, int);
 
 static void info_watchpoints_command (char *, int);
 
-static int breakpoint_1 (char *, int, 
-			 int (*) (const struct breakpoint *));
-
 static int breakpoint_cond_eval (void *);
 
 static void cleanup_executing_breakpoints (void *);
@@ -202,8 +193,6 @@  static enum print_stop_action print_bp_stop_message (bpstat bs);
 
 static int watchpoint_check (void *);
 
-static void maintenance_info_breakpoints (char *, int);
-
 static int hw_breakpoint_used_count (void);
 
 static int hw_watchpoint_use_count (struct breakpoint *);
@@ -221,10 +210,6 @@  static void enable_breakpoint_disp (struct breakpoint *, enum bpdisp,
 
 static void stop_command (char *arg, int from_tty);
 
-static void stopin_command (char *arg, int from_tty);
-
-static void stopat_command (char *arg, int from_tty);
-
 static void tcatch_command (char *arg, int from_tty);
 
 static void free_bp_location (struct bp_location *loc);
@@ -278,8 +263,6 @@  static void insert_breakpoint_locations (void);
 
 static void info_tracepoints_command (char *, int);
 
-static void delete_trace_command (char *, int);
-
 static void enable_trace_command (char *, int);
 
 static void disable_trace_command (char *, int);
@@ -6679,7 +6662,7 @@  pending_breakpoint_p (struct breakpoint *b)
    breakpoints listed.  */
 
 static int
-breakpoint_1 (char *args, int allflag, 
+breakpoint_1 (const char *args, int allflag, 
 	      int (*filter) (const struct breakpoint *))
 {
   struct breakpoint *b;
@@ -6864,7 +6847,7 @@  info_watchpoints_command (char *args, int from_tty)
 }
 
 static void
-maintenance_info_breakpoints (char *args, int from_tty)
+maintenance_info_breakpoints (const char *args, int from_tty)
 {
   breakpoint_1 (args, 1, NULL);
 
@@ -9795,7 +9778,7 @@  Usage: stop in <function | address>\n\
 }
 
 static void
-stopin_command (char *arg, int from_tty)
+stopin_command (const char *arg, int from_tty)
 {
   int badInput = 0;
 
@@ -9803,7 +9786,7 @@  stopin_command (char *arg, int from_tty)
     badInput = 1;
   else if (*arg != '*')
     {
-      char *argptr = arg;
+      const char *argptr = arg;
       int hasColon = 0;
 
       /* Look for a ':'.  If this is a line number specification, then
@@ -9828,7 +9811,7 @@  stopin_command (char *arg, int from_tty)
 }
 
 static void
-stopat_command (char *arg, int from_tty)
+stopat_command (const char *arg, int from_tty)
 {
   int badInput = 0;
 
@@ -9836,7 +9819,7 @@  stopat_command (char *arg, int from_tty)
     badInput = 1;
   else
     {
-      char *argptr = arg;
+      const char *argptr = arg;
       int hasColon = 0;
 
       /* Look for a ':'.  If there is a '::' then get out, otherwise
@@ -13568,7 +13551,7 @@  iterate_over_related_breakpoints (struct breakpoint *b,
   while (related != b);
 }
 
-void
+static void
 delete_command (char *arg, int from_tty)
 {
   struct breakpoint *b, *b_tmp;
@@ -14596,7 +14579,7 @@  enable_command (char *args, int from_tty)
 }
 
 static void
-enable_once_command (char *args, int from_tty)
+enable_once_command (const char *args, int from_tty)
 {
   map_breakpoint_numbers
     (args, [&] (breakpoint *b)
@@ -14610,7 +14593,7 @@  enable_once_command (char *args, int from_tty)
 }
 
 static void
-enable_count_command (char *args, int from_tty)
+enable_count_command (const char *args, int from_tty)
 {
   int count;
 
@@ -14631,7 +14614,7 @@  enable_count_command (char *args, int from_tty)
 }
 
 static void
-enable_delete_command (char *args, int from_tty)
+enable_delete_command (const char *args, int from_tty)
 {
   map_breakpoint_numbers
     (args, [&] (breakpoint *b)
@@ -15014,7 +14997,7 @@  disable_trace_command (char *args, int from_tty)
 
 /* Remove a tracepoint (or all if no argument).  */
 static void
-delete_trace_command (char *arg, int from_tty)
+delete_trace_command (const char *arg, int from_tty)
 {
   struct breakpoint *b, *b_tmp;
 
@@ -15208,7 +15191,7 @@  print_recreate_thread (struct breakpoint *b, struct ui_file *fp)
    non-zero.  */
 
 static void
-save_breakpoints (char *filename, int from_tty,
+save_breakpoints (const char *filename, int from_tty,
 		  int (*filter) (const struct breakpoint *))
 {
   struct breakpoint *tp;
@@ -15326,7 +15309,7 @@  save_breakpoints (char *filename, int from_tty,
 /* The `save breakpoints' command.  */
 
 static void
-save_breakpoints_command (char *args, int from_tty)
+save_breakpoints_command (const char *args, int from_tty)
 {
   save_breakpoints (args, from_tty, NULL);
 }
@@ -15334,7 +15317,7 @@  save_breakpoints_command (char *args, int from_tty)
 /* The `save tracepoints' command.  */
 
 static void
-save_tracepoints_command (char *args, int from_tty)
+save_tracepoints_command (const char *args, int from_tty)
 {
   save_breakpoints (args, from_tty, is_tracepoint);
 }
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 154ff3a..ff49cd2 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -1521,10 +1521,6 @@  extern int is_catchpoint (struct breakpoint *);
 extern void add_solib_catchpoint (const char *arg, int is_load, int is_temp,
                                   int enabled);
 
-/* Enable breakpoints and delete when hit.  Called with ARG == NULL
-   deletes all breakpoints.  */
-extern void delete_command (char *arg, int from_tty);
-
 /* Create and insert a new software single step breakpoint for the
    current thread.  May be called multiple times; each time will add a
    new location to the set of potential addresses the next instruction