diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/cli/cli-utils.c | 25 | ||||
| -rw-r--r-- | gdb/cli/cli-utils.h | 7 |
3 files changed, 31 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 64adfd2..2dc6cca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2013-11-14 Pedro Alves <palves@redhat.com> + Joel Brobecker <brobecker@adacore.com> + + * cli/cli-utils.h (extract_arg_const): Add declaration. + * cli/cli-utils.c (extract_arg_const): New function. + (extract_arg): Reimplement using extract_arg_const. + 2013-11-14 Joel Brobecker <brobecker@adacore.com> * language.h: Add "symtab.h" #include. diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c index f74e6b1..316cf4f 100644 --- a/gdb/cli/cli-utils.c +++ b/gdb/cli/cli-utils.c @@ -261,30 +261,39 @@ remove_trailing_whitespace (const char *start, char *s) /* See documentation in cli-utils.h. */ char * -extract_arg (char **arg) +extract_arg_const (const char **arg) { - char *result, *copy; + const char *result; if (!*arg) return NULL; /* Find the start of the argument. */ - *arg = skip_spaces (*arg); + *arg = skip_spaces_const (*arg); if (!**arg) return NULL; result = *arg; /* Find the end of the argument. */ - *arg = skip_to_space (*arg + 1); + *arg = skip_to_space_const (*arg + 1); if (result == *arg) return NULL; - copy = xmalloc (*arg - result + 1); - memcpy (copy, result, *arg - result); - copy[*arg - result] = '\0'; + return savestring (result, *arg - result); +} + +/* See documentation in cli-utils.h. */ + +char * +extract_arg (char **arg) +{ + const char *arg_const = *arg; + char *result; - return copy; + result = extract_arg_const (&arg_const); + *arg += arg_const - *arg; + return result; } /* See documentation in cli-utils.h. */ diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h index 152fb89..ebae2d2 100644 --- a/gdb/cli/cli-utils.h +++ b/gdb/cli/cli-utils.h @@ -118,6 +118,13 @@ extern char *remove_trailing_whitespace (const char *start, char *s); extern char *extract_arg (char **arg); +/* A const-correct version of "extract_arg". + + Since the returned value is xmalloc'd, it eventually needs to be + xfree'ed, which prevents us from making it const as well. */ + +extern char *extract_arg_const (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, |