FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New function cli-utils.c:extract_arg_const

Browse source 
This function provides the exact same functionality as extract_arg,
except that it takes a "const char**" instead of a "char **".
It allows us also to re-implement extract_arg almost as a simple
wrapper around the new function.

gdb/ChangeLog:

        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.
This commit is contained in:
Joel Brobecker 2013-11-11 09:19:32 +04:00
parent 671afef641
commit b5be8ce022
3 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gdb/cli/cli-utils.c
View file

@ -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);
}
return copy;
/* See documentation in cli-utils.h. */
char *
extract_arg (char **arg)
{
const char *arg_const = *arg;
char *result;
result = extract_arg_const (&arg_const);
*arg += arg_const - *arg;
return result;
}
/* See documentation in cli-utils.h. */