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/location.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/location.c') diff --git a/gdb/location.c b/gdb/location.c index 3238c9a..cda26e8 100644 --- a/gdb/location.c +++ b/gdb/location.c @@ -746,7 +746,7 @@ string_to_explicit_location (const char **argp, len = strlen (opt.get ()); /* Get the argument string. */ - *argp = skip_spaces_const (*argp); + *argp = skip_spaces (*argp); /* All options have a required argument. Checking for this required argument is deferred until later. */ @@ -779,7 +779,7 @@ string_to_explicit_location (const char **argp, else if (strncmp (opt.get (), "-line", len) == 0) { set_oarg (explicit_location_lex_one (argp, language, NULL)); - *argp = skip_spaces_const (*argp); + *argp = skip_spaces (*argp); if (have_oarg) { EL_EXPLICIT (location)->line_offset @@ -808,7 +808,7 @@ string_to_explicit_location (const char **argp, return location; } - *argp = skip_spaces_const (*argp); + *argp = skip_spaces (*argp); /* It's a little lame to error after the fact, but in this case, it provides a much better user experience to issue -- cgit v1.1