From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 51316 invoked by alias); 19 Oct 2016 22:54:02 -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 51305 invoked by uid 89); 19 Oct 2016 22:54:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_SOFTFAIL autolearn=no version=3.3.2 spammy=H*r:112, H*u:1.2.0, H*UA:1.2.0 X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 19 Oct 2016 22:54:00 +0000 Received: by simark.ca (Postfix, from userid 112) id 07A671E486; Wed, 19 Oct 2016 18:53:59 -0400 (EDT) Received: from simark.ca (localhost [127.0.0.1]) by simark.ca (Postfix) with ESMTP id 0ED2D1E124; Wed, 19 Oct 2016 18:53:58 -0400 (EDT) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Wed, 19 Oct 2016 22:54:00 -0000 From: Simon Marchi To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: [PATCH v2 13/31] Use ui_file_as_string in gdb/arm-tdep.c In-Reply-To: <1476839539-8374-14-git-send-email-palves@redhat.com> References: <1476839539-8374-1-git-send-email-palves@redhat.com> <1476839539-8374-14-git-send-email-palves@redhat.com> Message-ID: <6ce66459106ec6b0227fcaf4447d6cf5@simark.ca> X-Sender: simon.marchi@polymtl.ca User-Agent: Roundcube Webmail/1.2.0 X-IsSubscribed: yes X-SW-Source: 2016-10/txt/msg00591.txt.bz2 On 2016-10-18 21:12, Pedro Alves wrote: > gdb/ChangeLog: > yyyy-mm-yy Pedro Alves > > * arm-tdep.c (_initialize_arm_tdep): Use ui_file_as_string and > std::string. > --- > gdb/arm-tdep.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c > index 27a3ebe..31ebdc3 100644 > --- a/gdb/arm-tdep.c > +++ b/gdb/arm-tdep.c > @@ -9558,7 +9558,7 @@ _initialize_arm_tdep (void) > const char *setdesc; > const char *const *regnames; > int i; > - static char *helptext; > + static std::string helptext; > char regdesc[1024], *rdptr = regdesc; > size_t rest = sizeof (regdesc); > > @@ -9629,14 +9629,14 @@ _initialize_arm_tdep (void) > _("The valid values are:\n"), > regdesc, > _("The default is \"std\".")); > - helptext = ui_file_xstrdup (stb, NULL); > + helptext = ui_file_as_string (stb); > ui_file_delete (stb); > > add_setshow_enum_cmd("disassembler", no_class, > valid_disassembly_styles, &disassembly_style, > _("Set the disassembly style."), > _("Show the disassembly style."), > - helptext, > + helptext.c_str (), > set_disassembly_style_sfunc, > NULL, /* FIXME: i18n: The disassembly style is > \"%s\". */ I think helptext doesn't need to be static. Since add_setshow_* makes its own copy, it doesn't need to stay alive after the call.