diff options
author | Tom Tromey <tom@tromey.com> | 2017-09-12 18:32:41 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2017-09-27 08:44:45 -0600 |
commit | f2fc30156cb71a3e616186f09f0ffa0da26780fa (patch) | |
tree | ac4a2b19d0908061811c06a66defa9158a6e47e7 /gdb/linespec.c | |
parent | 8c2f95f4346a4ed6593b1e0cb60d1839176e42c2 (diff) | |
download | gdb-f2fc30156cb71a3e616186f09f0ffa0da26780fa.zip gdb-f2fc30156cb71a3e616186f09f0ffa0da26780fa.tar.gz gdb-f2fc30156cb71a3e616186f09f0ffa0da26780fa.tar.bz2 |
Constify some linespec functions
This changes a few linespec functions to work on "const char *" and
then fixes up all the callers. This allows further constification
elsewhere.
gdb/ChangeLog
2017-09-27 Tom Tromey <tom@tromey.com>
* tracepoint.c (info_scope_command): Constify.
* python/python.c (gdbpy_decode_line): Constify.
* python/py-breakpoint.c (bppy_init): Constify.
* mi/mi-cmd-break.c (mi_cmd_break_insert_1): Constify.
* location.h: (new_linespec_location)
(string_to_event_location_basic, string_to_event_location):
Constify.
* location.c (new_linespec_location)
(string_to_event_location_basic, string_to_event_location):
Constify.
* linespec.h (decode_line_with_current_source)
(decode_line_with_last_displayed, linespec_lex_to_end): Constify.
* linespec.c (linespec_lex_to_end)
(decode_line_with_current_source)
(decode_line_with_last_displayed): Constify.
* guile/scm-breakpoint.c (gdbscm_register_breakpoint_x):
Constify.
* cli/cli-cmds.c (edit_command, list_command): Constify.
* breakpoint.h (until_break_command, watch_command_wrapper)
(awatch_command_wrapper, rwatch_command_wrapper)
(init_ada_exception_breakpoint): Constify.
* breakpoint.c (break_command_1, dprintf_command)
(break_range_command, watch_command_wrapper)
(rwatch_command_wrapper, awatch_command_wrapper)
(until_break_command, init_ada_exception_breakpoint)
(strace_marker_create_sals_from_location, trace_command)
(ftrace_command, strace_command, struct tracepoint): Constify.
* ax-gdb.c (agent_command_1): Constify.
* ada-lang.c (ada_exception_sal): Constify.
Diffstat (limited to 'gdb/linespec.c')
-rw-r--r-- | gdb/linespec.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gdb/linespec.c b/gdb/linespec.c index 6e472e2..19db83e 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -2793,7 +2793,7 @@ linespec_parser_delete (void *arg) /* See description in linespec.h. */ void -linespec_lex_to_end (char **stringp) +linespec_lex_to_end (const char **stringp) { linespec_parser parser; struct cleanup *cleanup; @@ -3338,7 +3338,7 @@ decode_line_1 (const struct event_location *location, int flags, /* See linespec.h. */ std::vector<symtab_and_line> -decode_line_with_current_source (char *string, int flags) +decode_line_with_current_source (const char *string, int flags) { if (string == 0) error (_("Empty line specification.")); @@ -3361,7 +3361,7 @@ decode_line_with_current_source (char *string, int flags) /* See linespec.h. */ std::vector<symtab_and_line> -decode_line_with_last_displayed (char *string, int flags) +decode_line_with_last_displayed (const char *string, int flags) { if (string == 0) error (_("Empty line specification.")); @@ -3472,19 +3472,21 @@ decode_objc (struct linespec_state *self, linespec_p ls, const char *arg) if (self->canonical) { - char *str; + std::string holder; + const char *str; self->canonical->pre_expanded = 1; if (ls->explicit_loc.source_filename) { - str = xstrprintf ("%s:%s", - ls->explicit_loc.source_filename, saved_arg); + holder = string_printf ("%s:%s", + ls->explicit_loc.source_filename, + saved_arg); + str = holder.c_str (); } else - str = xstrdup (saved_arg); + str = saved_arg; - make_cleanup (xfree, str); self->canonical->location = new_linespec_location (&str); } } |