From patchwork Tue Sep 12 18:57:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 22858 Received: (qmail 16159 invoked by alias); 12 Sep 2017 19:03:05 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 16150 invoked by uid 89); 12 Sep 2017 19:03:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=12410, reallocated X-HELO: gproxy3-pub.mail.unifiedlayer.com Received: from gproxy3-pub.mail.unifiedlayer.com (HELO gproxy3-pub.mail.unifiedlayer.com) (69.89.30.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 12 Sep 2017 19:03:02 +0000 Received: from cmgw4 (unknown [10.0.90.85]) by gproxy3.mail.unifiedlayer.com (Postfix) with ESMTP id 9527D42A7A for ; Tue, 12 Sep 2017 12:57:44 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id 8ixh1w01f2f2jeq01ixk8t; Tue, 12 Sep 2017 12:57:44 -0600 X-Authority-Analysis: v=2.2 cv=OZLoNlbY c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=zstS-IiYAAAA:8 a=OZYQYiEsrTuvXrbsDmAA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-76-94.hlrn.qwest.net ([75.166.76.94]:46142 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1drqNR-001eRR-2a; Tue, 12 Sep 2017 12:57:41 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 03/11] Remove cleanups from mi-cmd-var.c Date: Tue, 12 Sep 2017 12:57:28 -0600 Message-Id: <20170912185736.20436-4-tom@tromey.com> In-Reply-To: <20170912185736.20436-1-tom@tromey.com> References: <20170912185736.20436-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1drqNR-001eRR-2a X-Source-Sender: 75-166-76-94.hlrn.qwest.net (bapiya.Home) [75.166.76.94]:46142 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes This removes some cleanups from mi-cmd-var.c. varobj_gen_name now returns a string, simplifying mi_cmd_var_create. In mi_cmd_var_delete, a string copy is apparently unnecessary, so it's simply removed. ChangeLog 2017-09-12 Tom Tromey * varobj.h (varobj_gen_name): Return std::string. * varobj.c (varobj_gen_name): Return std::string. * mi/mi-cmd-var.c (mi_cmd_var_create): Use std::string. (mi_cmd_var_delete): Don't copy "name". --- gdb/ChangeLog | 7 +++++++ gdb/mi/mi-cmd-var.c | 43 +++++++++++-------------------------------- gdb/varobj.c | 7 ++----- gdb/varobj.h | 2 +- 4 files changed, 21 insertions(+), 38 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 15a19bb8..b1fdcda 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2017-09-12 Tom Tromey + * varobj.h (varobj_gen_name): Return std::string. + * varobj.c (varobj_gen_name): Return std::string. + * mi/mi-cmd-var.c (mi_cmd_var_create): Use std::string. + (mi_cmd_var_delete): Don't copy "name". + +2017-09-12 Tom Tromey + * mi/mi-cmd-break.c (mi_argv_to_format): Return std::string. (mi_cmd_break_insert_1): Update. diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index 8b22b2f..b628814 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -95,32 +95,21 @@ mi_cmd_var_create (const char *command, char **argv, int argc) struct ui_out *uiout = current_uiout; CORE_ADDR frameaddr = 0; struct varobj *var; - char *name; char *frame; char *expr; - struct cleanup *old_cleanups; enum varobj_type var_type; if (argc != 3) error (_("-var-create: Usage: NAME FRAME EXPRESSION.")); - name = xstrdup (argv[0]); - /* Add cleanup for name. Must be free_current_contents as name can - be reallocated. */ - old_cleanups = make_cleanup (free_current_contents, &name); - - frame = xstrdup (argv[1]); - make_cleanup (xfree, frame); + std::string name = argv[0]; - expr = xstrdup (argv[2]); - make_cleanup (xfree, expr); + frame = argv[1]; + expr = argv[2]; - if (strcmp (name, "-") == 0) - { - xfree (name); - name = varobj_gen_name (); - } - else if (!isalpha (*name)) + if (name == "-") + name = varobj_gen_name (); + else if (!isalpha (name[0])) error (_("-var-create: name of object must begin with a letter")); if (strcmp (frame, "*") == 0) @@ -135,10 +124,10 @@ mi_cmd_var_create (const char *command, char **argv, int argc) if (varobjdebug) fprintf_unfiltered (gdb_stdlog, - "Name=\"%s\", Frame=\"%s\" (%s), Expression=\"%s\"\n", - name, frame, hex_string (frameaddr), expr); + "Name=\"%s\", Frame=\"%s\" (%s), Expression=\"%s\"\n", + name.c_str (), frame, hex_string (frameaddr), expr); - var = varobj_create (name, expr, frameaddr, var_type); + var = varobj_create (name.c_str (), expr, frameaddr, var_type); if (var == NULL) error (_("-var-create: unable to create variable object")); @@ -146,8 +135,6 @@ mi_cmd_var_create (const char *command, char **argv, int argc) print_varobj (var, PRINT_ALL_VALUES, 0 /* don't print expression */); uiout->field_int ("has_more", varobj_has_more (var, 0)); - - do_cleanups (old_cleanups); } void @@ -157,16 +144,12 @@ mi_cmd_var_delete (const char *command, char **argv, int argc) struct varobj *var; int numdel; int children_only_p = 0; - struct cleanup *old_cleanups; struct ui_out *uiout = current_uiout; if (argc < 1 || argc > 2) error (_("-var-delete: Usage: [-c] EXPRESSION.")); - name = xstrdup (argv[0]); - /* Add cleanup for name. Must be free_current_contents as name can - be reallocated. */ - old_cleanups = make_cleanup (free_current_contents, &name); + name = argv[0]; /* If we have one single argument it cannot be '-c' or any string starting with '-'. */ @@ -186,9 +169,7 @@ mi_cmd_var_delete (const char *command, char **argv, int argc) if (strcmp (name, "-c") != 0) error (_("-var-delete: Invalid option.")); children_only_p = 1; - do_cleanups (old_cleanups); - name = xstrdup (argv[1]); - old_cleanups = make_cleanup (free_current_contents, &name); + name = argv[1]; } /* If we didn't error out, now NAME contains the name of the @@ -199,8 +180,6 @@ mi_cmd_var_delete (const char *command, char **argv, int argc) numdel = varobj_delete (var, children_only_p); uiout->field_int ("ndeleted", numdel); - - do_cleanups (old_cleanups); } /* Parse a string argument into a format value. */ diff --git a/gdb/varobj.c b/gdb/varobj.c index f669180..2d850fb 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -435,17 +435,14 @@ varobj_create (const char *objname, /* Generates an unique name that can be used for a varobj. */ -char * +std::string varobj_gen_name (void) { static int id = 0; - char *obj_name; /* Generate a name for this object. */ id++; - obj_name = xstrprintf ("var%d", id); - - return obj_name; + return string_printf ("var%d", id); } /* Given an OBJNAME, returns the pointer to the corresponding varobj. Call diff --git a/gdb/varobj.h b/gdb/varobj.h index e35c1b8..0d4a537 100644 --- a/gdb/varobj.h +++ b/gdb/varobj.h @@ -233,7 +233,7 @@ extern struct varobj *varobj_create (const char *objname, const char *expression, CORE_ADDR frame, enum varobj_type type); -extern char *varobj_gen_name (void); +extern std::string varobj_gen_name (void); extern struct varobj *varobj_get_handle (const char *name);