This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit/Ada] Use skip_spaces and skip_to_space in ada-lang.c
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Cc: Joel Brobecker <brobecker at adacore dot com>
- Date: Wed, 4 Jan 2012 18:56:15 +0400
- Subject: [commit/Ada] 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.
Tested on x86_64-linux. Checked in.
---
gdb/ChangeLog | 8 ++++++++
gdb/ada-lang.c | 20 ++++++--------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 07e8be0..8bdb758 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+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 Jan Kratochvil <jan.kratochvil@redhat.com>
Revert:
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 2f87b03..393d694 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')
@@ -11539,19 +11539,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. */
@@ -11585,8 +11579,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"));
@@ -11819,8 +11812,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."));
}
--
1.7.1