From a30bf1f15c51b82a0134713bc44175cda296d3ae Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 6 Jun 2014 13:19:53 -0600 Subject: [PATCH] constify to_rcmd This makes the "command" parameter of the to_rcmd target method const. 2014-06-16 Tom Tromey * target.h (struct target_ops) : Make "command" const. * target.c (debug_to_rcmd, default_rcmd): Update. * target-delegates.c: Rebuild. * remote.c (remote_rcmd): Update. * monitor.c (monitor_rcmd): Update. --- gdb/ChangeLog | 8 ++++++++ gdb/monitor.c | 2 +- gdb/remote.c | 4 ++-- gdb/target-delegates.c | 2 +- gdb/target.c | 7 ++++--- gdb/target.h | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index de892a2088a..6ed744752d5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-06-16 Tom Tromey + + * target.h (struct target_ops) : Make "command" const. + * target.c (debug_to_rcmd, default_rcmd): Update. + * target-delegates.c: Rebuild. + * remote.c (remote_rcmd): Update. + * monitor.c (monitor_rcmd): Update. + 2014-06-16 Pedro Alves * breakpoint.c (insert_bp_location, remove_breakpoint_1): Adjust. diff --git a/gdb/monitor.c b/gdb/monitor.c index 25742ac5a3e..4a57d5e6e40 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -2282,7 +2282,7 @@ monitor_stop (struct target_ops *self, ptid_t ptid) ourseleves here cause of a nasty echo. */ static void -monitor_rcmd (struct target_ops *self, char *command, +monitor_rcmd (struct target_ops *self, const char *command, struct ui_file *outbuf) { char *p; diff --git a/gdb/remote.c b/gdb/remote.c index 9db34100d7b..12a79972a32 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -8988,7 +8988,7 @@ remote_search_memory (struct target_ops* ops, } static void -remote_rcmd (struct target_ops *self, char *command, +remote_rcmd (struct target_ops *self, const char *command, struct ui_file *outbuf) { struct remote_state *rs = get_remote_state (); @@ -9010,7 +9010,7 @@ remote_rcmd (struct target_ops *self, char *command, error (_("\"monitor\" command ``%s'' is too long."), command); /* Encode the actual command. */ - bin2hex ((gdb_byte *) command, p, strlen (command)); + bin2hex ((const gdb_byte *) command, p, strlen (command)); if (putpkt (rs->buf) < 0) error (_("Communication problem with target.")); diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index e6fbb448937..522d52be484 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -631,7 +631,7 @@ tdefault_stop (struct target_ops *self, ptid_t arg1) } static void -delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) +delegate_rcmd (struct target_ops *self, const char *arg1, struct ui_file *arg2) { self = self->beneath; self->to_rcmd (self, arg1, arg2); diff --git a/gdb/target.c b/gdb/target.c index f73ab3c2b14..a9255d7caf3 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -57,7 +57,7 @@ static int default_watchpoint_addr_within_range (struct target_ops *, static int default_region_ok_for_hw_watchpoint (struct target_ops *, CORE_ADDR, int); -static void default_rcmd (struct target_ops *, char *, struct ui_file *); +static void default_rcmd (struct target_ops *, const char *, struct ui_file *); static ptid_t default_get_ada_task_ptid (struct target_ops *self, long lwp, long tid); @@ -4006,7 +4006,7 @@ debug_to_stop (struct target_ops *self, ptid_t ptid) } static void -debug_to_rcmd (struct target_ops *self, char *command, +debug_to_rcmd (struct target_ops *self, const char *command, struct ui_file *outbuf) { debug_target.to_rcmd (&debug_target, command, outbuf); @@ -4080,7 +4080,8 @@ stack of targets currently in use (including the exec-file,\n\ core-file, and process, if any), as well as the symbol file name."; static void -default_rcmd (struct target_ops *self, char *command, struct ui_file *output) +default_rcmd (struct target_ops *self, const char *command, + struct ui_file *output) { error (_("\"monitor\" command not supported by this target.")); } diff --git a/gdb/target.h b/gdb/target.h index cd5a79962d4..87d2a83027e 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -560,7 +560,7 @@ struct target_ops void (*to_stop) (struct target_ops *, ptid_t) TARGET_DEFAULT_IGNORE (); void (*to_rcmd) (struct target_ops *, - char *command, struct ui_file *output) + const char *command, struct ui_file *output) TARGET_DEFAULT_FUNC (default_rcmd); char *(*to_pid_to_exec_file) (struct target_ops *, int pid) TARGET_DEFAULT_RETURN (NULL); -- 2.30.2