From patchwork Sun Jan 12 12:03:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 104606 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4FD603858406 for ; Sun, 12 Jan 2025 12:06:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4FD603858406 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=UAkWIAOq X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id EDBB43857810 for ; Sun, 12 Jan 2025 12:04:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EDBB43857810 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EDBB43857810 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736683449; cv=none; b=YeOUbczoUiOLrd2RsOQjTcRhBT3WX7OuRNvBRO1A+ttqP6vclf724ctKGFSIlurIcs3UrfbfcZIY9IT+9E4effU5gX/iVr0D+M8uXI1gqx7rFvOO/uiwMmDfEXgi6+I+fRbJ7N5PqIBufbxVZw+VEtLjtKvvYoR1Mm2tlI42VkE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736683449; c=relaxed/simple; bh=3/gbdN+ZUMJQ5j7594Bq7XoqNISMXk87s9sXvpdiY48=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=NB13qbQ2SvavvrOuxhneznTtaOtZn5SvRDJ0Yca+7CUkBDmXK+XoC0Qm+7F45h8J9DabwRfs0pSN3wLdAvEm/wtpxXdTE97/jIINNUXZ59pQXlEsj5n220PxoLlvLS/KvkQSVBLddWRM+QLjeqsZD8HH2hwpmJmu6EaQP5UbDhg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EDBB43857810 Received: from eig-obgw-5004a.ext.cloudfilter.net ([10.0.29.221]) by cmsmtp with ESMTPS id WagitikieqewVWwhMtXCet; Sun, 12 Jan 2025 12:04:08 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id WwhKtmxwmWvXpWwhLtOLve; Sun, 12 Jan 2025 12:04:07 +0000 X-Authority-Analysis: v=2.4 cv=LtdZyWdc c=1 sm=1 tr=0 ts=6783afb7 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=VdSt8ZQiCzkA:10 a=ItBw4LHWJt0A:10 a=JOfjbqwot2fvHNstPakA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=6Ogn3jAGHLSNbaov7Orx:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=FMiM/GYWHImEFxIePjtbZvXAFe3/NX0idrntabxwYWU=; b=UAkWIAOqkAEmfNnRqmATYlB9x8 CZqKL/WTJXjaCuUXmxb4hzs6flX3iTHoiCqsD6HT/Eoa9AQy1fthFnsUY+mcxcMhAraSI1QZZbDBW RFo4z1p7SMPgRdSKuCDMiq9jr; Received: from 97-118-36-154.hlrn.qwest.net ([97.118.36.154]:46946 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1tWwhK-00212c-1n; Sun, 12 Jan 2025 05:04:06 -0700 From: Tom Tromey Date: Sun, 12 Jan 2025 05:03:58 -0700 Subject: [PATCH 1/4] Avoid calling help_list in more places MIME-Version: 1.0 Message-Id: <20250112-submit-help-list-style-title-v1-1-9457a2686440@tromey.com> References: <20250112-submit-help-list-style-title-v1-0-9457a2686440@tromey.com> In-Reply-To: <20250112-submit-help-list-style-title-v1-0-9457a2686440@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.118.36.154 X-Source-L: No X-Exim-ID: 1tWwhK-00212c-1n X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-36-154.hlrn.qwest.net (prentzel.local) [97.118.36.154]:46946 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfNFh4Y/CMrxwMWpN0UK/EvHS075UNpKOEPm7HrYCJ9l89yi9AcGQNmZC/d3JGsCXeUo8Tev9fJMcUxs5vCq4g1m+LmMxnnjS9dls3ZWtVl53AbMjx6qT i9LuubYz/e6VkbKMknZVwMauSxeoDBabxuqQtmfXklzY0fVZGf0zSLduoPCz8LvQ/Up9Ltp4odOZ4xYoOxaeQktyffxx4ZMCafQ= X-Spam-Status: No, score=-3020.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_LOTSOFHASH, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org I think there is no need to have a prefix command that simply calls help_list. Instead, add_basic_prefix_cmd can be used. This patch changes the relevant instances. In one spot, add_setshow_prefix_cmd is used instead. --- gdb/printcmd.c | 10 +--------- gdb/source.c | 29 ++++++----------------------- gdb/tui/tui-layout.c | 10 +--------- gdb/tui/tui-win.c | 14 +++----------- 4 files changed, 11 insertions(+), 52 deletions(-) diff --git a/gdb/printcmd.c b/gdb/printcmd.c index f1aaa644042e93a3435d7aaa4e8d26bfe9185f10..a9c4e935f3a6e088cc01af1d74097fa08afffbda 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -2922,14 +2922,6 @@ show_memory_tagging_unsupported (void) " architecture.")); } -/* Implement the "memory-tag" prefix command. */ - -static void -memory_tag_command (const char *arg, int from_tty) -{ - help_list (memory_tag_list, "memory-tag ", all_commands, gdb_stdout); -} - /* Helper for print-logical-tag and print-allocation-tag. */ static void @@ -3386,7 +3378,7 @@ Convert the arguments to a string as \"printf\" would, but then\n\ treat this string as a command line, and evaluate it.")); /* Memory tagging commands. */ - add_prefix_cmd ("memory-tag", class_vars, memory_tag_command, _("\ + add_basic_prefix_cmd ("memory-tag", class_vars, _("\ Generic command for printing and manipulating memory tag properties."), &memory_tag_list, 0, &cmdlist); add_cmd ("print-logical-tag", class_vars, diff --git a/gdb/source.c b/gdb/source.c index a225280e794631908aeceab6110421bb7bd29089..0d6523cd305385b51af67bc6fa41d4c1e1075342 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1909,22 +1909,6 @@ source_lines_range::source_lines_range (int startline, } } -/* Handle the "set source" base command. */ - -static void -set_source (const char *arg, int from_tty) -{ - help_list (setsourcelist, "set source ", all_commands, gdb_stdout); -} - -/* Handle the "show source" base command. */ - -static void -show_source (const char *args, int from_tty) -{ - help_list (showsourcelist, "show source ", all_commands, gdb_stdout); -} - void _initialize_source (); void @@ -2045,13 +2029,12 @@ By default, relative filenames are displayed."), show_filename_display_string, &setlist, &showlist); - add_prefix_cmd ("source", no_class, set_source, - _("Generic command for setting how sources are handled."), - &setsourcelist, 0, &setlist); - - add_prefix_cmd ("source", no_class, show_source, - _("Generic command for showing source settings."), - &showsourcelist, 0, &showlist); + add_setshow_prefix_cmd + ("source", no_class, + _("Generic command for setting how sources are handled."), + _("Generic command for showing source settings."), + &setsourcelist, &showsourcelist, + &setlist, &showlist); add_setshow_boolean_cmd ("open", class_files, &source_open, _("\ Set whether GDB should open source files."), _("\ diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 2b6cb3194ae024479540d5a032e6dd97ff9e6081..79b7289c2a61fe93c5c1aa8cc375ff3bc9129fc1 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -1120,14 +1120,6 @@ destroy_layout (struct cmd_list_element *self, void *context) static struct cmd_list_element *layout_list; -/* Called to implement 'tui layout'. */ - -static void -tui_layout_command (const char *args, int from_tty) -{ - help_list (layout_list, "tui layout ", all_commands, gdb_stdout); -} - /* Add a "layout" command with name NAME that switches to LAYOUT. */ static struct cmd_list_element * @@ -1307,7 +1299,7 @@ void _initialize_tui_layout () { struct cmd_list_element *layout_cmd - = add_prefix_cmd ("layout", class_tui, tui_layout_command, _("\ + = add_basic_prefix_cmd ("layout", class_tui, _("\ Change the layout of windows.\n\ Usage: tui layout prev | next | LAYOUT-NAME"), &layout_list, 0, tui_get_cmd_list ()); diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 414d4699bea7e1cffd8a22439d739e4101abc40c..33b24d8946d9e770f2466648c05f4f89e8407ea9 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1082,14 +1082,6 @@ parse_scrolling_args (const char *arg, static cmd_list_element *tui_window_cmds = nullptr; -/* Called to implement 'tui window'. */ - -static void -tui_window_command (const char *args, int from_tty) -{ - help_list (tui_window_cmds, "tui window ", all_commands, gdb_stdout); -} - /* See tui-win.h. */ bool tui_left_margin_verbose = false; @@ -1125,9 +1117,9 @@ Usage: tabset N")); deprecate_cmd (tabset_cmd, "set tui tab-width"); /* Setup the 'tui window' list of command. */ - add_prefix_cmd ("window", class_tui, tui_window_command, - _("Text User Interface window commands."), - &tui_window_cmds, 1, tui_get_cmd_list ()); + add_basic_prefix_cmd ("window", class_tui, + _("Text User Interface window commands."), + &tui_window_cmds, 1, tui_get_cmd_list ()); cmd_list_element *winheight_cmd = add_cmd ("height", class_tui, tui_set_win_height_command, _("\