This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
pushed: [RFA 2/3] New function cli-utils.c:extract_arg_const
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Date: Thu, 14 Nov 2013 14:55:04 +0400
- Subject: pushed: [RFA 2/3] New function cli-utils.c:extract_arg_const
- Authentication-results: sourceware.org; auth=none
- References: <1384151855-12926-1-git-send-email-brobecker at adacore dot com> <1384151855-12926-2-git-send-email-brobecker at adacore dot com> <5283D42D dot 8000909 at redhat dot com>
> Instead of essentially duplicating the code, how about we reimplement
> one on top of the other? See below. It compiles, but it's otherwise
> untested.
Indeed! I actually had started with something very similar, and
backtracked, because other units failed to compile. But that was
because I had also made the return value a "const" which, in
hindsight, was no reason for me to backtrack the whole way!
Attached is what I ended up pushing.
gdb/ChangeLog:
* 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.
Tested on x86_64-linux.
Thanks, Pedro.
--
Joel
>From b5be8ce022f894831b133b3b424238d8058eb29e Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Mon, 11 Nov 2013 09:19:32 +0400
Subject: [PATCH 1/2] New function cli-utils.c:extract_arg_const
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.
---
gdb/ChangeLog | 7 +++++++
gdb/cli/cli-utils.c | 25 +++++++++++++++++--------
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,
--
1.8.1.2