From patchwork Sat Oct 27 19:41:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Waroquiers X-Patchwork-Id: 29922 Received: (qmail 7794 invoked by alias); 27 Oct 2018 19:41:49 -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 7780 invoked by uid 89); 27 Oct 2018 19:41:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mailsec118.isp.belgacom.be Received: from mailsec118.isp.belgacom.be (HELO mailsec118.isp.belgacom.be) (195.238.20.114) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 27 Oct 2018 19:41:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skynet.be; i=@skynet.be; q=dns/txt; s=securemail; t=1540669305; x=1572205305; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=e/YR7pBCFQlRMu2WSlpp0cp50dx8TZzWSlcCML1AJwY=; b=RkmnqH8JCLiebQNxxwCkt25n9r0YIcqKeqfAJ2w+7rfd3fTYYm7WdKMI KRFEM/c4f2+71h3wX3t9T9+fMU1ZAQ==; Received: from 110.212-243-81.adsl-dyn.isp.belgacom.be (HELO md.home) ([81.243.212.110]) by relay.skynet.be with ESMTP/TLS/DHE-RSA-AES128-GCM-SHA256; 27 Oct 2018 21:41:43 +0200 From: Philippe Waroquiers To: gdb-patches@sourceware.org Cc: Philippe Waroquiers Subject: [PUSHED] OBVIOUS Use report_unrecognized_option_error in 'demangle' and 'info macro' commands. Date: Sat, 27 Oct 2018 21:41:35 +0200 Message-Id: <20181027194135.27132-1-philippe.waroquiers@skynet.be> MIME-Version: 1.0 X-IsSubscribed: yes Rather than have some local logic to throw an error for an unrecognized option, use the new cli-utils.h function throwing an error. At the same time, fix some wrong indentation in info_macro_command and fix a small bug in 'demangle' error handling: Without the patch: (gdb) demangle -L c++ abcd Unrecognized option 'c++' to demangle command. Try "help demangle". (gdb) With the patch: (gdb) demangle -L c++ abcd Unrecognized option '-L' to demangle command. Try "help demangle". 2018-10-27 Philippe Waroquiers * macrocmd.c (info_macro_command): Use report_unrecognized_option_error to report a bad option and fix indentation. * demangle.c (demangle_command): Use report_unrecognized_option_error to report a bad option and correctly report the bad option. --- gdb/ChangeLog | 7 +++++++ gdb/demangle.c | 6 +----- gdb/macrocmd.c | 8 ++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2fb66c619c..ff36b9b1f1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-10-27 Philippe Waroquiers + + * macrocmd.c (info_macro_command): Use report_unrecognized_option_error + to report a bad option and fix indentation. + * demangle.c (demangle_command): Use report_unrecognized_option_error + to report a bad option and correctly report the bad option. + 2018-10-27 Tom Tromey PR cli/23364: diff --git a/gdb/demangle.c b/gdb/demangle.c index a37b065893..8b341ee67b 100644 --- a/gdb/demangle.c +++ b/gdb/demangle.c @@ -180,11 +180,7 @@ demangle_command (const char *args, int from_tty) else if (strncmp (arg_start, "--", p - arg_start) == 0) processing_args = 0; else - { - std::string option = extract_arg (&p); - error (_("Unrecognized option '%s' to demangle command. " - "Try \"help demangle\"."), option.c_str ()); - } + report_unrecognized_option_error ("demangle", arg_start); arg_start = skip_spaces (p); } diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c index e6cf921a1b..110423fbae 100644 --- a/gdb/macrocmd.c +++ b/gdb/macrocmd.c @@ -199,13 +199,9 @@ info_macro_command (const char *args, int from_tty) e.g. Scheme's (defmacro ->foo () "bar\n") */ processing_args = 0; else - { - error (_("Unrecognized option '%.*s' to info macro command. " - "Try \"help info macro\"."), - int (p - arg_start), arg_start); - } + report_unrecognized_option_error ("info macro", arg_start); - arg_start = skip_spaces (p); + arg_start = skip_spaces (p); } name = arg_start;