diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/ax-gdb.c | 2 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 5 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.c | 3 | ||||
| -rw-r--r-- | gdb/cli/cli-utils.c | 3 | ||||
| -rw-r--r-- | gdb/cli/cli-utils.h | 4 |
6 files changed, 15 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3843e12..538db3a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2019-06-13 Pedro Alves <palves@redhat.com> + + * ax-gdb.c (agent_command_1): Remove skip_spaces call. + * breakpoint.c (watch_maybe_just_location): Remove skip_spaces + call. + * cli/cli-cmds.c (apropos_command): Remove skip_spaces call. + * cli/cli-utils.c (extract_info_print_args): Remove skip_spaces + calls. + (check_for_argument): Skip spaces after argument. + 2019-06-13 Pedro Alves <palves@redhat.com> * thread.c (thread_apply_command): Adjust TID parsing. diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 778e895..5872bec 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2634,8 +2634,6 @@ agent_command_1 (const char *exp, int eval) { struct linespec_result canonical; - exp = skip_spaces (exp); - event_location_up location = new_linespec_location (&exp, symbol_name_match_type::WILD); decode_line_full (location.get (), DECODE_LINE_FUNFIRSTLINE, NULL, diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 80f343e..dce8a0f 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10896,10 +10896,7 @@ watch_maybe_just_location (const char *arg, int accessflag, int from_tty) if (arg && (check_for_argument (&arg, "-location", sizeof ("-location") - 1) || check_for_argument (&arg, "-l", sizeof ("-l") - 1))) - { - arg = skip_spaces (arg); - just_location = 1; - } + just_location = 1; watch_command_1 (arg, accessflag, from_tty, just_location, 0); } diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 5c44ba9..62f4d7f 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1381,9 +1381,6 @@ apropos_command (const char *arg, int from_tty) { bool verbose = arg && check_for_argument (&arg, "-v", 2); - if (verbose) - arg = skip_spaces (arg); - if (arg == NULL || *arg == '\0') error (_("REGEXP string is empty")); diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c index c8b07f0..a24fe92 100644 --- a/gdb/cli/cli-utils.c +++ b/gdb/cli/cli-utils.c @@ -139,7 +139,6 @@ extract_info_print_args (const char **args, /* Check for NAMEREGEXP or -- NAMEREGEXP. */ if (**args != '-' || check_for_argument (args, "--", 2)) { - *args = skip_spaces (*args); *regexp = *args; *args = NULL; return true; @@ -155,7 +154,6 @@ extract_info_print_args (const char **args, if (check_for_argument (args, "-q", 2)) { *quiet = true; - *args = skip_spaces (*args); return true; } @@ -459,6 +457,7 @@ check_for_argument (const char **str, const char *arg, int arg_len) && ((*str)[arg_len] == '\0' || isspace ((*str)[arg_len]))) { *str += arg_len; + *str = skip_spaces (*str); return 1; } return 0; diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h index d0161db..9425fb4 100644 --- a/gdb/cli/cli-utils.h +++ b/gdb/cli/cli-utils.h @@ -188,7 +188,9 @@ extern std::string extract_arg (const char **arg); /* A helper function that looks for an argument at the start of a string. The argument must also either be at the end of the string, or be followed by whitespace. Returns 1 if it finds the argument, - 0 otherwise. If the argument is found, it updates *STR. */ + 0 otherwise. If the argument is found, it updates *STR to point + past the argument and past any whitespace following the + argument. */ extern int check_for_argument (const char **str, const char *arg, int arg_len); /* Same, for non-const STR. */ |