From 5cf3b309489d1606ee0fb7e452f467d82fd1b765 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Wed, 8 Sep 2021 16:07:19 +0100 Subject: [PATCH] gdb: remove duplicate cmd_list_element declarations For some reason we have two locations where cmd_list_elements are declared, cli/cli-cmds.h and gdbcmd.h. Worse still there is duplication between these two locations. In this commit I have moved all of the cmd_list_element declarations from gdbcmd.h into cli/cli-cmds.h and removed the duplicates. There should be no user visible changes after this commit. --- gdb/cli/cli-cmds.h | 32 ++++++++++++++ gdb/gdbcmd.h | 105 +-------------------------------------------- 2 files changed, 33 insertions(+), 104 deletions(-) diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h index b57645cdc8c..ce2e38886f1 100644 --- a/gdb/cli/cli-cmds.h +++ b/gdb/cli/cli-cmds.h @@ -93,10 +93,38 @@ extern struct cmd_list_element *maintenanceprintlist; extern struct cmd_list_element *maintenanceflushlist; +/* Chain containing all defined "maintenance check" subcommands. */ + +extern struct cmd_list_element *maintenancechecklist; + +/* Chain containing all defined "maintenance set" subcommands. */ + +extern struct cmd_list_element *maintenance_set_cmdlist; + +/* Chain containing all defined "maintenance show" subcommands. */ + +extern struct cmd_list_element *maintenance_show_cmdlist; + extern struct cmd_list_element *setprintlist; extern struct cmd_list_element *showprintlist; +/* Chain containing all defined "set print raw" subcommands. */ + +extern struct cmd_list_element *setprintrawlist; + +/* Chain containing all defined "show print raw" subcommands. */ + +extern struct cmd_list_element *showprintrawlist; + +/* Chain containing all defined "set print type" subcommands. */ + +extern struct cmd_list_element *setprinttypelist; + +/* Chain containing all defined "show print type" subcommands. */ + +extern struct cmd_list_element *showprinttypelist; + extern struct cmd_list_element *setdebuglist; extern struct cmd_list_element *showdebuglist; @@ -105,6 +133,10 @@ extern struct cmd_list_element *setchecklist; extern struct cmd_list_element *showchecklist; +/* Chain containing all defined "save" subcommands. */ + +extern struct cmd_list_element *save_cmdlist; + /* Limit the call depth of user-defined commands */ extern unsigned int max_user_call_depth; diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h index 27550c1faee..59afb0aa2ed 100644 --- a/gdb/gdbcmd.h +++ b/gdb/gdbcmd.h @@ -27,110 +27,7 @@ #include "command.h" #include "ui-out.h" #include "cli/cli-script.h" - -/* Chain containing all defined commands. */ - -extern struct cmd_list_element *cmdlist; - -/* Chain containing all defined info subcommands. */ - -extern struct cmd_list_element *infolist; - -/* Chain containing all defined enable subcommands. */ - -extern struct cmd_list_element *enablelist; - -/* Chain containing all defined disable subcommands. */ - -extern struct cmd_list_element *disablelist; - -/* Chain containing all defined delete subcommands. */ - -extern struct cmd_list_element *deletelist; - -/* Chain containing all defined detach subcommands. */ - -extern struct cmd_list_element *detachlist; - -/* Chain containing all defined kill subcommands. */ - -extern struct cmd_list_element *killlist; - -/* Chain containing all defined stop subcommands. */ - -extern struct cmd_list_element *stoplist; - -/* Chain containing all defined set subcommands. */ - -extern struct cmd_list_element *setlist; - -/* Chain containing all defined unset subcommands. */ - -extern struct cmd_list_element *unsetlist; - -/* Chain containing all defined show subcommands. */ - -extern struct cmd_list_element *showlist; - -/* Chain containing all defined \"set history\". */ - -extern struct cmd_list_element *sethistlist; - -/* Chain containing all defined \"show history\". */ - -extern struct cmd_list_element *showhistlist; - -/* Chain containing all defined \"unset history\". */ - -extern struct cmd_list_element *unsethistlist; - -/* Chain containing all defined maintenance subcommands. */ - -extern struct cmd_list_element *maintenancelist; - -/* Chain containing all defined "maintenance info" subcommands. */ - -extern struct cmd_list_element *maintenanceinfolist; - -/* Chain containing all defined "maintenance print" subcommands. */ - -extern struct cmd_list_element *maintenanceprintlist; - -/* Chain containing all defined "maintenance check" subcommands. */ - -extern struct cmd_list_element *maintenancechecklist; - -/* Chain containing all defined "maintenance set" subcommands. */ - -extern struct cmd_list_element *maintenance_set_cmdlist; - -/* Chain containing all defined "maintenance show" subcommands. */ - -extern struct cmd_list_element *maintenance_show_cmdlist; - -extern struct cmd_list_element *setprintlist; - -extern struct cmd_list_element *showprintlist; - -extern struct cmd_list_element *setprintrawlist; - -extern struct cmd_list_element *showprintrawlist; - -extern struct cmd_list_element *setprinttypelist; - -extern struct cmd_list_element *showprinttypelist; - -extern struct cmd_list_element *setdebuglist; - -extern struct cmd_list_element *showdebuglist; - -extern struct cmd_list_element *setchecklist; - -extern struct cmd_list_element *showchecklist; - -/* Chain containing all defined "save" subcommands. */ - -extern struct cmd_list_element *save_cmdlist; +#include "cli/cli-cmds.h" extern void execute_command (const char *, int); -- 2.30.2