diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2012-01-04 14:55:09 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2012-01-04 14:55:09 +0000 |
| commit | 0fcd72ba3772517ba91b2e84f39db6be8e194630 (patch) | |
| tree | 222060e045d150a2fd69420772621d9409e6ff13 | |
| parent | 5e0a92a9869b4e15cdce8d6e7d60f1404fda609c (diff) | |
| download | gdb-0fcd72ba3772517ba91b2e84f39db6be8e194630.zip gdb-0fcd72ba3772517ba91b2e84f39db6be8e194630.tar.gz gdb-0fcd72ba3772517ba91b2e84f39db6be8e194630.tar.bz2 | |
Use skip_spaces and skip_to_space in ada-lang.c
This is just a minor cleanup that reduces a bit the code in ada-lang.c
by using skip_spaces or skip_to_space, instead of doing the skipping
ourselves.
gdb/ChangeLog:
* ada-lang.c: #include "cli/cli-utils.h".
(get_selections): Use skip_spaces.
(ada_get_next_arg): Use skip_spaces and skip_to_space.
(catch_ada_exception_command_split): Use skip_spaces.
(ada_decode_assert_location): Likewise.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dfd010a..7cb2dc7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2012-01-04 Joel Brobecker <brobecker@adacore.com> + * ada-lang.c: #include "cli/cli-utils.h". + (get_selections): Use skip_spaces. + (ada_get_next_arg): Use skip_spaces and skip_to_space. + (catch_ada_exception_command_split): Use skip_spaces. + (ada_decode_assert_location): Likewise. + +2012-01-04 Joel Brobecker <brobecker@adacore.com> + * linespec.c (decode_line_internal): Check for C++ or Java compound constructs only if the current language is C, C++ or Java. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 01eb01d..e2f4727 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -63,6 +63,7 @@ #include "mi/mi-common.h" #include "arch-utils.h" #include "exceptions.h" +#include "cli/cli-utils.h" /* Define whether or not the C operator '/' truncates towards zero for differently signed operands (truncation direction is undefined in C). @@ -3611,8 +3612,7 @@ get_selections (int *choices, int n_choices, int max_results, char *args2; int choice, j; - while (isspace (*args)) - args += 1; + args = skip_spaces (args); if (*args == '\0' && n_chosen == 0) error_no_arg (_("one or more choice numbers")); else if (*args == '\0') @@ -11538,19 +11538,13 @@ ada_get_next_arg (char **argsp) char *end; char *result; - /* Skip any leading white space. */ - - while (isspace (*args)) - args++; - + args = skip_spaces (args); if (args[0] == '\0') return NULL; /* No more arguments. */ /* Find the end of the current argument. */ - end = args; - while (*end != '\0' && !isspace (*end)) - end++; + end = skip_to_space (args); /* Adjust ARGSP to point to the start of the next argument. */ @@ -11584,8 +11578,7 @@ catch_ada_exception_command_split (char *args, /* Check that we do not have any more arguments. Anything else is unexpected. */ - while (isspace (*args)) - args++; + args = skip_spaces (args); if (args[0] != '\0') error (_("Junk at end of expression")); @@ -11818,8 +11811,7 @@ ada_decode_assert_location (char *args, char **addr_string, if (args != NULL) { - while (isspace (*args)) - args++; + args = skip_spaces (args); if (*args != '\0') error (_("Junk at end of arguments.")); } |