From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15926 invoked by alias); 27 Nov 2012 07:26:29 -0000 Received: (qmail 15872 invoked by uid 22791); 27 Nov 2012 07:26:27 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 27 Nov 2012 07:26:22 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1TdFYi-0007Sn-9x from Yao_Qi@mentor.com ; Mon, 26 Nov 2012 23:26:20 -0800 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Mon, 26 Nov 2012 23:26:20 -0800 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.1.289.1; Mon, 26 Nov 2012 23:26:18 -0800 Message-ID: <50B46ABF.7050509@codesourcery.com> Date: Tue, 27 Nov 2012 07:26:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Joel Brobecker CC: Subject: Re: [PATCH] Fix -Wformat-extra-args warning. References: <1353921793-26314-1-git-send-email-yao@codesourcery.com> <20121126093720.GA12042@adacore.com> In-Reply-To: <20121126093720.GA12042@adacore.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-IsSubscribed: yes 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 X-SW-Source: 2012-11/txt/msg00697.txt.bz2 On 11/26/2012 05:37 PM, Joel Brobecker wrote: > Thanks for doing all those cleanups! > >> >2012-11-26 Yao Qi >> > >> > * symtab.c (symtab_symbol_info): Fix a -Wformat-extra-args >> > warning. > Your version does look much better to me also, by a mile. I do think > you need i18n, though. OK with the _() mark up. > I noticed another i18n markup is missing in some lines below, so get it fix together in this patch. Below is what I committed. -- Yao (齐尧) gdb: 2012-11-27 Yao Qi * symtab.c (symtab_symbol_info): Fix a -Wformat-extra-args warning. Add i18n markup. --- gdb/symtab.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 05943cf..c4bd13d 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -3778,10 +3778,11 @@ symtab_symbol_info (char *regexp, enum search_domain kind, int from_tty) search_symbols (regexp, kind, 0, (char **) NULL, &symbols); old_chain = make_cleanup_free_search_symbols (symbols); - printf_filtered (regexp - ? "All %ss matching regular expression \"%s\":\n" - : "All defined %ss:\n", - classnames[kind], regexp); + if (regexp != NULL) + printf_filtered (_("All %ss matching regular expression \"%s\":\n"), + classnames[kind], regexp); + else + printf_filtered (_("All defined %ss:\n"), classnames[kind]); for (p = symbols; p != NULL; p = p->next) { @@ -3791,7 +3792,7 @@ symtab_symbol_info (char *regexp, enum search_domain kind, int from_tty) { if (first) { - printf_filtered ("\nNon-debugging symbols:\n"); + printf_filtered (_("\nNon-debugging symbols:\n")); first = 0; } print_msymbol_info (p->msymbol); -- 1.7.7.6