From 7f19b9a2d27295b92e12c1767a56afd54857be5f Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 15 Jun 2002 18:45:32 +0000 Subject: * defs.h (auto_boolean): Declare enum. * command.h (cmd_auto_boolean): Delete enum. * mips-tdep.c (mask_address_var): Update. (mips_mask_address_p): Update. (show_mask_address): Update. * remote.c (struct packet_config): Update. (update_packet_config): Update. (show_packet_config_cmd): Update. (packet_ok): Update. (add_packet_config_cmd): Update. (_initialize_remote): * command.h: Update. * cli/cli-setshow.c (parse_auto_binary_operation): Update. (do_setshow_command): Update. * cli/cli-decode.c (add_set_auto_boolean_cmd): Update. * cli/cli-decode.h: Update. --- gdb/cli/cli-decode.c | 2 +- gdb/cli/cli-decode.h | 2 +- gdb/cli/cli-setshow.c | 21 ++++++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'gdb/cli') diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 3f510ac..16be5e8 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -371,7 +371,7 @@ add_set_enum_cmd (char *name, struct cmd_list_element * add_set_auto_boolean_cmd (char *name, enum command_class class, - enum cmd_auto_boolean *var, + enum auto_boolean *var, char *doc, struct cmd_list_element **list) { diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h index 72436f0..5b6f968 100644 --- a/gdb/cli/cli-decode.h +++ b/gdb/cli/cli-decode.h @@ -296,7 +296,7 @@ extern struct cmd_list_element *add_set_enum_cmd (char *name, extern struct cmd_list_element *add_set_auto_boolean_cmd (char *name, enum command_class class, - enum cmd_auto_boolean *var, + enum auto_boolean *var, char *doc, struct cmd_list_element **list); diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index f967b0c..94ba94e 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -34,9 +34,8 @@ static int parse_binary_operation (char *); -static enum cmd_auto_boolean parse_auto_binary_operation (const char *arg); -static enum cmd_auto_boolean +static enum auto_boolean parse_auto_binary_operation (const char *arg) { if (arg != NULL && *arg != '\0') @@ -48,18 +47,18 @@ parse_auto_binary_operation (const char *arg) || strncmp (arg, "1", length) == 0 || strncmp (arg, "yes", length) == 0 || strncmp (arg, "enable", length) == 0) - return CMD_AUTO_BOOLEAN_TRUE; + return AUTO_BOOLEAN_TRUE; else if (strncmp (arg, "off", length) == 0 || strncmp (arg, "0", length) == 0 || strncmp (arg, "no", length) == 0 || strncmp (arg, "disable", length) == 0) - return CMD_AUTO_BOOLEAN_FALSE; + return AUTO_BOOLEAN_FALSE; else if (strncmp (arg, "auto", length) == 0 || (strncmp (arg, "-1", length) == 0 && length > 1)) - return CMD_AUTO_BOOLEAN_AUTO; + return AUTO_BOOLEAN_AUTO; } error ("\"on\", \"off\" or \"auto\" expected."); - return CMD_AUTO_BOOLEAN_AUTO; /* pacify GCC */ + return AUTO_BOOLEAN_AUTO; /* pacify GCC */ } static int @@ -167,7 +166,7 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c) *(int *) c->var = parse_binary_operation (arg); break; case var_auto_boolean: - *(enum cmd_auto_boolean *) c->var = parse_auto_binary_operation (arg); + *(enum auto_boolean *) c->var = parse_auto_binary_operation (arg); break; case var_uinteger: if (arg == NULL) @@ -296,15 +295,15 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c) fputs_filtered (*(int *) c->var ? "on" : "off", stb->stream); break; case var_auto_boolean: - switch (*(enum cmd_auto_boolean*) c->var) + switch (*(enum auto_boolean*) c->var) { - case CMD_AUTO_BOOLEAN_TRUE: + case AUTO_BOOLEAN_TRUE: fputs_filtered ("on", stb->stream); break; - case CMD_AUTO_BOOLEAN_FALSE: + case AUTO_BOOLEAN_FALSE: fputs_filtered ("off", stb->stream); break; - case CMD_AUTO_BOOLEAN_AUTO: + case AUTO_BOOLEAN_AUTO: fputs_filtered ("auto", stb->stream); break; default: -- cgit v1.1