This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFC] move some command lists out of cli/cli-cmds.c
- From: Yao Qi <yao at codesourcery dot com>
- To: <gdb-patches at sourceware dot org>
- Date: Wed, 8 Aug 2012 15:04:45 +0800
- Subject: [RFC] move some command lists out of cli/cli-cmds.c
Hello,
Some command list, such as enablebreaklist and skiplist, are only
used in its own files (breakpoint.c and skip.c respectively). We
don't have to put them in cli-cmds.c (IIUC, only commands list
needed by multiple files can be put in cli-cmds.c).
This patch is to move enablebreaklist and skiplist from cli/cli-cmds.c
to breakpoint.c and skip.c, then command list is grouped together
with its sub-commands.
Is it OK?
gdb:
2012-08-08 Yao Qi <yao@codesourcery.com>
* cli/cli-cmds.c (enablebreaklist): Move it to breakpoint.c.
(skiplist): Move it to skip.c.
(init_cmd_lists): Remove code setting enablebreaklist and
skiplist to NULL.
* breakpoint.c (enablebreaklist): Moved from cli/cli-cmds.c.
* cli/cli-cmds.h: Remove declaration of enablebreaklist and
skiplist.
* gdbcmd.h: Likewise.
* skip.c (_initialize_step_skip): Move 'skiplist' from
cli/cli-cmds.c.
---
gdb/breakpoint.c | 4 ++++
gdb/cli/cli-cmds.c | 8 --------
gdb/cli/cli-cmds.h | 6 ------
gdb/gdbcmd.h | 6 ------
gdb/skip.c | 1 +
5 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 03719d4..18da6a2 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -15861,6 +15861,10 @@ initialize_breakpoint_ops (void)
ops->print_recreate = bkpt_print_recreate;
}
+/* Chain containing all defined "enable breakpoint" subcommands. */
+
+static struct cmd_list_element *enablebreaklist = NULL;
+
void
_initialize_breakpoint (void)
{
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 6595d5b..2a80803 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -136,10 +136,6 @@ struct cmd_list_element *detachlist;
struct cmd_list_element *killlist;
-/* Chain containing all defined "enable breakpoint" subcommands. */
-
-struct cmd_list_element *enablebreaklist;
-
/* Chain containing all defined set subcommands */
struct cmd_list_element *setlist;
@@ -188,8 +184,6 @@ struct cmd_list_element *setchecklist;
struct cmd_list_element *showchecklist;
-struct cmd_list_element *skiplist;
-
/* Command tracing state. */
int source_verbose = 0;
@@ -1576,7 +1570,6 @@ init_cmd_lists (void)
stoplist = NULL;
deletelist = NULL;
detachlist = NULL;
- enablebreaklist = NULL;
setlist = NULL;
unsetlist = NULL;
showlist = NULL;
@@ -1590,7 +1583,6 @@ init_cmd_lists (void)
showprintlist = NULL;
setchecklist = NULL;
showchecklist = NULL;
- skiplist = NULL;
}
static void
diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
index 4b4e74c..068a72a 100644
--- a/gdb/cli/cli-cmds.h
+++ b/gdb/cli/cli-cmds.h
@@ -53,10 +53,6 @@ extern struct cmd_list_element *togglelist;
extern struct cmd_list_element *stoplist;
-/* Chain containing all defined "enable breakpoint" subcommands. */
-
-extern struct cmd_list_element *enablebreaklist;
-
/* Chain containing all defined set subcommands */
extern struct cmd_list_element *setlist;
@@ -105,8 +101,6 @@ extern struct cmd_list_element *setchecklist;
extern struct cmd_list_element *showchecklist;
-extern struct cmd_list_element *skiplist;
-
/* Exported to gdb/top.c */
void init_cmd_lists (void);
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
index b21adc7..c7e3a27 100644
--- a/gdb/gdbcmd.h
+++ b/gdb/gdbcmd.h
@@ -64,10 +64,6 @@ extern struct cmd_list_element *togglelist;
extern struct cmd_list_element *stoplist;
-/* Chain containing all defined "enable breakpoint" subcommands. */
-
-extern struct cmd_list_element *enablebreaklist;
-
/* Chain containing all defined set subcommands. */
extern struct cmd_list_element *setlist;
@@ -124,8 +120,6 @@ extern struct cmd_list_element *setchecklist;
extern struct cmd_list_element *showchecklist;
-extern struct cmd_list_element *skiplist;
-
/* Chain containing all defined "save" subcommands. */
extern struct cmd_list_element *save_cmdlist;
diff --git a/gdb/skip.c b/gdb/skip.c
index 8e19652..5a3fae3 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -545,6 +545,7 @@ extern initialize_file_ftype _initialize_step_skip;
void
_initialize_step_skip (void)
{
+ static struct cmd_list_element *skiplist = NULL;
struct cmd_list_element *c;
skiplist_entry_chain = 0;
--
1.7.7.6