/* CLI utilities.
- Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ Copyright (C) 2011-2014 Free Software Foundation, Inc.
This file is part of GDB.
#include "defs.h"
#include "cli/cli-utils.h"
-#include "gdb_string.h"
+#include <string.h>
#include "value.h"
#include "gdb_assert.h"
/* See documentation in cli-utils.h. */
-char *
-skip_to_space (char *chp)
+const char *
+skip_to_space_const (const char *chp)
{
if (chp == NULL)
return NULL;
/* 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. */