From f1735a53a63040cc4b4a735bf18a3f20d308e519 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 10 Sep 2017 14:19:19 -0600 Subject: Rename _const functions to use overloading instead This renames a few functions -- skip_spaces_const, skip_to_space_const, get_number_const, extract_arg_const -- to drop the "_const" suffix and instead rely on overloading. This makes future const fixes simpler by reducing the number of lines that must be changed. I think it is also not any less clear, as all these functions have the same interface as their non-const versions by design. Furthermore there's an example of using an overload in-tree already, namely check_for_argument. This patch was largely created using some perl one-liners; then a few fixes were applied by hand. ChangeLog 2017-09-11 Tom Tromey * common/common-utils.h (skip_to_space): Remove macro, redeclare as function. (skip_to_space): Rename from skip_to_space_const. * common/common-utils.c (skip_to_space): New function. (skip_to_space): Rename from skip_to_space_const. * cli/cli-utils.h (get_number): Rename from get_number_const. (extract_arg): Rename from extract_arg_const. * cli/cli-utils.c (get_number): Rename from get_number_const. (extract_arg): Rename from extract_arg_const. (number_or_range_parser::get_number): Use ::get_number. * aarch64-linux-tdep.c, ada-lang.c, arm-linux-tdep.c, ax-gdb.c, break-catch-throw.c, breakpoint.c, cli/cli-cmds.c, cli/cli-dump.c, cli/cli-script.c, cli/cli-setshow.c, compile/compile.c, completer.c, demangle.c, disasm.c, findcmd.c, linespec.c, linux-tdep.c, linux-thread-db.c, location.c, mi/mi-parse.c, minsyms.c, nat/linux-procfs.c, printcmd.c, probe.c, python/py-breakpoint.c, record.c, rust-exp.y, serial.c, stack.c, stap-probe.c, tid-parse.c, tracepoint.c: Update all callers. --- gdb/cli/cli-dump.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gdb/cli/cli-dump.c') diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c index 8e59ed4..8d57119 100644 --- a/gdb/cli/cli-dump.c +++ b/gdb/cli/cli-dump.c @@ -45,7 +45,7 @@ scan_expression (const char **cmd, const char *def) end = (*cmd) + strcspn (*cmd, " \t"); exp = savestring ((*cmd), end - (*cmd)); - (*cmd) = skip_spaces_const (end); + (*cmd) = skip_spaces (end); return gdb::unique_xmalloc_ptr (exp); } } @@ -71,10 +71,10 @@ scan_filename (const char **cmd, const char *defname) /* FIXME: should parse a possibly quoted string. */ const char *end; - (*cmd) = skip_spaces_const (*cmd); + (*cmd) = skip_spaces (*cmd); end = *cmd + strcspn (*cmd, " \t"); filename.reset (savestring ((*cmd), end - (*cmd))); - (*cmd) = skip_spaces_const (end); + (*cmd) = skip_spaces (end); } gdb_assert (filename != NULL); @@ -538,7 +538,7 @@ restore_command (char *args_in, int from_tty) { binary_flag = 1; args += strlen (binary_string); - args = skip_spaces_const (args); + args = skip_spaces (args); } /* Parse offset (optional). */ if (args != NULL && *args != '\0') -- cgit v1.1