From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 54522 invoked by alias); 29 Sep 2017 01:40:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 54453 invoked by uid 89); 29 Sep 2017 01:40:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gproxy4-pub.mail.unifiedlayer.com Received: from gproxy4-pub.mail.unifiedlayer.com (HELO gproxy4-pub.mail.unifiedlayer.com) (69.89.23.142) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 29 Sep 2017 01:40:54 +0000 Received: from cmgw3 (unknown [10.0.90.84]) by gproxy4.mail.unifiedlayer.com (Postfix) with ESMTP id DB231175D9A for ; Thu, 28 Sep 2017 19:40:52 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id FDgp1w00h2f2jeq01DgsGj; Thu, 28 Sep 2017 19:40:52 -0600 X-Authority-Analysis: v=2.2 cv=K/VSJ2eI c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=20KFwNOVAAAA:8 a=zstS-IiYAAAA:8 a=xH9KoMVyrQMzpKonrL0A:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-0-208.hlrn.qwest.net ([75.166.0.208]:34842 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dxkIL-0002fk-G2; Thu, 28 Sep 2017 19:40:49 -0600 From: Tom Tromey To: Pedro Alves Cc: Tom Tromey , gdb-patches@sourceware.org Subject: Re: [RFA 03/11] Remove cleanups from mi-cmd-var.c References: <20170912185736.20436-1-tom@tromey.com> <20170912185736.20436-4-tom@tromey.com> Date: Fri, 29 Sep 2017 01:40:00 -0000 In-Reply-To: (Pedro Alves's message of "Thu, 28 Sep 2017 10:36:13 +0100") Message-ID: <87ing2wack.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-BWhitelist: no X-Exim-ID: 1dxkIL-0002fk-G2 X-Source-Sender: 75-166-0-208.hlrn.qwest.net (bapiya) [75.166.0.208]:34842 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-SW-Source: 2017-09/txt/msg00894.txt.bz2 >>>>> "Pedro" == Pedro Alves writes: Pedro> There's still a deep copy in that last else above. Pedro> We should be able to get rid of that like this: [...] Here's my latest. Tom diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1a58d82..5a6791e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +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-28 Tom Tromey * mi/mi-cmd-break.c (mi_argv_to_format): Return std::string. diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index 8b22b2f..0215b1a 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -95,32 +95,24 @@ 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); - - expr = xstrdup (argv[2]); - make_cleanup (xfree, expr); + frame = argv[1]; + expr = argv[2]; + const char *name = argv[0]; + std::string gen_name; if (strcmp (name, "-") == 0) { - xfree (name); - name = varobj_gen_name (); + gen_name = varobj_gen_name (); + name = gen_name.c_str (); } - else if (!isalpha (*name)) + else if (!isalpha (name[0])) error (_("-var-create: name of object must begin with a letter")); if (strcmp (frame, "*") == 0) @@ -135,7 +127,7 @@ 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=\"%s\", Frame=\"%s\" (%s), Expression=\"%s\"\n", name, frame, hex_string (frameaddr), expr); var = varobj_create (name, expr, frameaddr, var_type); @@ -146,8 +138,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 +147,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 +172,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 +183,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);