OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove "cmd_type" function 

The cmd_type function only has a single caller, which is in the CLI
implementation code.  This patch removes the function, and moves the
cmd_types enum definition from command.h to cli-decode.h, fixing an 18
year old FIXME.

gdb/ChangeLog
2020-06-28  Tom Tromey  <tom@tromey.com>

	* command.h (cmd_types): Remove.
	(cmd_type): Don't declare.
	* cli/cli-decode.h (enum cmd_types): Uncomment.  No longer a
	typedef.
	* cli/cli-cmds.c (setting_cmd): Use cmd->type directly.
	* cli/cli-decode.c (cmd_type): Remove.
This commit is contained in:
Tom Tromey 2020-06-28 10:33:06 -06:00
parent a5122bfa07
commit cd4c4c07f4
5 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2020-06-28 Tom Tromey <tom@tromey.com>
* command.h (cmd_types): Remove.
(cmd_type): Don't declare.
* cli/cli-decode.h (enum cmd_types): Uncomment. No longer a
typedef.
* cli/cli-cmds.c (setting_cmd): Use cmd->type directly.
* cli/cli-decode.c (cmd_type): Remove.
2020-06-27 Pedro Alves <palves@redhat.com>
* fork-child.c (prefork_hook): Adjust.

2
gdb/cli/cli-cmds.c
View File

@ -2069,7 +2069,7 @@ setting_cmd (const char *fnname, struct cmd_list_element *showlist,
const char *a0 = (const char *) value_contents (argv[0]);
cmd_list_element *cmd = lookup_cmd (&a0, showlist, "", NULL, -1, 0);
if (cmd == nullptr || cmd_type (cmd) != show_cmd)
if (cmd == nullptr || cmd->type != show_cmd)
error (_("First argument of %s must be a "
"valid setting of the 'show' command."), fnname);

6
gdb/cli/cli-decode.c
View File

@ -139,12 +139,6 @@ get_cmd_context (struct cmd_list_element *cmd)
return cmd->context;
}
enum cmd_types
cmd_type (struct cmd_list_element *cmd)
{
return cmd->type;
}
void
set_cmd_completer (struct cmd_list_element *cmd, completer_ftype *completer)
{

17
gdb/cli/cli-decode.h
View File

@ -27,20 +27,15 @@
#include "cli-script.h"
#include "completer.h"
#if 0
/* FIXME: cagney/2002-03-17: Once cmd_type() has been removed, ``enum
cmd_types'' can be moved from "command.h" to "cli-decode.h". */
/* Not a set/show command. Note that some commands which begin with
"set" or "show" might be in this category, if their syntax does
not fall into one of the following categories. */
typedef enum cmd_types
{
not_set_cmd,
set_cmd,
show_cmd
}
cmd_types;
#endif
enum cmd_types
{
not_set_cmd,
set_cmd,
show_cmd
};
/* This structure records one command'd definition. */

16
gdb/command.h
View File

@ -71,19 +71,6 @@ enum command_class
no_set_class
};
/* FIXME: cagney/2002-03-17: Once cmd_type() has been removed, ``enum
cmd_types'' can be moved from "command.h" to "cli-decode.h". */
/* Not a set/show command. Note that some commands which begin with
"set" or "show" might be in this category, if their syntax does
not fall into one of the following categories. */
typedef enum cmd_types
{
not_set_cmd,
set_cmd,
show_cmd
}
cmd_types;
/* Types of "set" or "show" command. */
typedef enum var_types
{
@ -282,9 +269,6 @@ extern void *get_cmd_context (struct cmd_list_element *cmd);
extern void execute_cmd_pre_hook (struct cmd_list_element *cmd);
extern void execute_cmd_post_hook (struct cmd_list_element *cmd);
/* Return the type of the command. */
extern enum cmd_types cmd_type (struct cmd_list_element *cmd);
/* Flag for an ambiguous cmd_list result. */
#define CMD_LIST_AMBIGUOUS ((struct cmd_list_element *) -1)