From: "Tom Tromey (Code Review)" <gerrit@gnutoolchain-gerrit.osci.io>
To: gdb-patches@sourceware.org
Subject: [review v2] Add add_internal_function overload
Date: Sun, 17 Nov 2019 21:52:00 -0000 [thread overview]
Message-ID: <20191117215231.8093C28172@gnutoolchain-gerrit.osci.io> (raw)
In-Reply-To: <gerrit.1573862632000.I3f6df925bc6b3e1bccbad9eeebc487b908bb5a2a@gnutoolchain-gerrit.osci.io>
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/662
......................................................................
Add add_internal_function overload
add_internal_function sets a command destroyer that frees the doc
string. However, many callers do not pass in an allocated doc string.
This adds a new overload to clearly differentiate the two cases,
fixing the latent bug.
2019-11-15 Tom Tromey <tom@tromey.com>
* value.h (add_internal_function): Add new overload. Move
documentation from value.h.
* value.c (do_add_internal_function): New function.
(add_internal_function): Use it. Add new overload.
(function_destroyer): Don't free doc.
* python/py-function.c (fnpy_init): Update.
Change-Id: I3f6df925bc6b3e1bccbad9eeebc487b908bb5a2a
---
M gdb/ChangeLog
M gdb/python/py-function.c
M gdb/value.c
M gdb/value.h
4 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bbef23a..1745e8b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
2019-11-15 Tom Tromey <tom@tromey.com>
+ * value.h (add_internal_function): Add new overload. Move
+ documentation from value.h.
+ * value.c (do_add_internal_function): New function.
+ (add_internal_function): Use it. Add new overload.
+ (function_destroyer): Don't free doc.
+ * python/py-function.c (fnpy_init): Update.
+
+2019-11-15 Tom Tromey <tom@tromey.com>
+
* python/py-cmd.c (cmdpy_destroyer): Don't free "doc".
(cmdpy_init): Set "doc_allocated".
diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index 46a66cf..1c45887 100644
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -127,7 +127,7 @@
if (! docstring)
docstring.reset (xstrdup (_("This function is not documented.")));
- add_internal_function (name, docstring.release (), fnpy_call,
+ add_internal_function (name, std::move (docstring), fnpy_call,
self_ref.release ());
return 0;
}
diff --git a/gdb/value.c b/gdb/value.c
index 47e647a..b2714eb 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -2426,17 +2426,13 @@
function_destroyer (struct cmd_list_element *self, void *ignore)
{
xfree ((char *) self->name);
- xfree ((char *) self->doc);
}
-/* Add a new internal function. NAME is the name of the function; DOC
- is a documentation string describing the function. HANDLER is
- called when the function is invoked. COOKIE is an arbitrary
- pointer which is passed to HANDLER and is intended for "user
- data". */
-void
-add_internal_function (const char *name, const char *doc,
- internal_function_fn handler, void *cookie)
+/* Helper function that does the work for add_internal_function. */
+
+static struct cmd_list_element *
+do_add_internal_function (const char *name, const char *doc,
+ internal_function_fn handler, void *cookie)
{
struct cmd_list_element *cmd;
struct internal_function *ifn;
@@ -2448,6 +2444,29 @@
cmd = add_cmd (xstrdup (name), no_class, function_command, (char *) doc,
&functionlist);
cmd->destroyer = function_destroyer;
+
+ return cmd;
+}
+
+/* See value.h. */
+
+void
+add_internal_function (const char *name, const char *doc,
+ internal_function_fn handler, void *cookie)
+{
+ do_add_internal_function (name, doc, handler, cookie);
+}
+
+/* See value.h. */
+
+void
+add_internal_function (const char *name, gdb::unique_xmalloc_ptr<char> &&doc,
+ internal_function_fn handler, void *cookie)
+{
+ struct cmd_list_element *cmd
+ = do_add_internal_function (name, doc.get (), handler, cookie);
+ doc.release ();
+ cmd->doc_allocated = 1;
}
/* Update VALUE before discarding OBJFILE. COPIED_TYPES is used to
diff --git a/gdb/value.h b/gdb/value.h
index 2b5d784..fdef835 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -1165,9 +1165,22 @@
int argc,
struct value **argv);
-void add_internal_function (const char *name, const char *doc,
- internal_function_fn handler,
- void *cookie);
+/* Add a new internal function. NAME is the name of the function; DOC
+ is a documentation string describing the function. HANDLER is
+ called when the function is invoked. COOKIE is an arbitrary
+ pointer which is passed to HANDLER and is intended for "user
+ data". */
+
+extern void add_internal_function (const char *name, const char *doc,
+ internal_function_fn handler,
+ void *cookie);
+
+/* This overload takes an allocated documentation string. */
+
+extern void add_internal_function (const char *name,
+ gdb::unique_xmalloc_ptr<char> &&doc,
+ internal_function_fn handler,
+ void *cookie);
struct value *call_internal_function (struct gdbarch *gdbarch,
const struct language_defn *language,
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I3f6df925bc6b3e1bccbad9eeebc487b908bb5a2a
Gerrit-Change-Number: 662
Gerrit-PatchSet: 2
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newpatchset
next prev parent reply other threads:[~2019-11-17 21:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-16 0:04 [review] " Tom Tromey (Code Review)
2019-11-17 21:52 ` Tom Tromey (Code Review) [this message]
2019-11-26 21:29 ` [pushed] " Sourceware to Gerrit sync (Code Review)
2019-11-26 21:29 ` Sourceware to Gerrit sync (Code Review)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191117215231.8093C28172@gnutoolchain-gerrit.osci.io \
--to=gerrit@gnutoolchain-gerrit.osci.io \
--cc=gdb-patches@sourceware.org \
--cc=tromey@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).