2005-02-09 Andrew Cagney <cagney@gnu.org>

	* cli/cli-decode.c (add_setshow_enum_cmd): Drop set_result and
	show_result parameters.
	* mips-tdep.c (_initialize_mips_tdep): Update calls.
	* command.h: Update declaration.
	* arm-tdep.c (_initialize_arm_tdep, _initialize_arm_tdep): Update
	calls.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 846f997..7ced885 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2005-02-09  Andrew Cagney  <cagney@gnu.org>
 
+       * cli/cli-decode.c (add_setshow_enum_cmd): Drop set_result and
+       show_result parameters.
+       * mips-tdep.c (_initialize_mips_tdep): Update calls.
+       * command.h: Update declaration.
+       * arm-tdep.c (_initialize_arm_tdep, _initialize_arm_tdep): Update
+       calls.
+
        * NEWS: Mention removed commands.
        * m68hc11-tdep.c (show_regs): Delete, unused.
        (_initialize_m68hc11_tdep): Delete deprecated "regs" command.

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 6c6664f..0d12630 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2886,7 +2886,7 @@ _initialize_arm_tdep (void)
                       helptext,
                       _("The disassembly style is \"%s\"."),
                       set_disassembly_style_sfunc, NULL,
-                      &setarmcmdlist, &showarmcmdlist, NULL, NULL);
+                      &setarmcmdlist, &showarmcmdlist);
 
   add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32,
                           _("Set usage of ARM 32-bit mode."),
@@ -2907,7 +2907,7 @@ softvfp - Software FP with pure-endian doubles.\n\
 vfp - VFP co-processor."),
                        _("The floating point type is \"%s\"."),
                        set_fp_model_sfunc, show_fp_model,
-                       &setarmcmdlist, &showarmcmdlist, NULL, NULL);
+                       &setarmcmdlist, &showarmcmdlist);
 
   /* Debugging flag.  */
   add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug,

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index df70019..1e91572 100644 (file)
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -419,19 +419,15 @@ add_setshow_enum_cmd (char *name,
                      cmd_sfunc_ftype *set_func,
                      cmd_sfunc_ftype *show_func,
                      struct cmd_list_element **set_list,
-                     struct cmd_list_element **show_list,
-                     struct cmd_list_element **set_result,
-                     struct cmd_list_element **show_result)
+                     struct cmd_list_element **show_list)
 {
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_enum, var,
                        set_doc, show_doc, help_doc, print,
                        set_func, show_func,
                        set_list, show_list,
-                       &c, show_result);
+                       &c, NULL);
   c->enums = enumlist;
-  if (set_result)
-    *set_result = c;
 }
 
 /* Add an auto-boolean command named NAME to both the set and show

diff --git a/gdb/command.h b/gdb/command.h
index 899d0d6..5b7a542 100644 (file)
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -234,9 +234,7 @@ extern void add_setshow_enum_cmd (char *name,
                                  cmd_sfunc_ftype *set_func,
                                  cmd_sfunc_ftype *show_func,
                                  struct cmd_list_element **set_list,
-                                 struct cmd_list_element **show_list,
-                                 struct cmd_list_element **set_result,
-                                 struct cmd_list_element **show_result);
+                                 struct cmd_list_element **show_list);
 
 extern void add_setshow_auto_boolean_cmd (char *name,
                                          enum command_class class,

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 68164e7..48a22b5 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -5189,8 +5189,7 @@ This option can be set to one of:\n\
           saved GP register size from information contained in the executable.\n\
           (default: auto)", "\
 Size of general purpose registers saved on the stack is %s.\n",
-                       NULL, NULL, &setmipscmdlist, &showmipscmdlist,
-                       NULL, NULL);
+                       NULL, NULL, &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to override the argument stack size. */
   add_setshow_enum_cmd ("stack-arg-size", class_obscure,
@@ -5203,8 +5202,7 @@ This option can be set to one of:\n\
   auto  - Allow GDB to determine the correct setting from the current\n\
           target and executable (default)", "\
 The amount of stack space reserved for each argument is %s.\n",
-                       NULL, NULL, &setmipscmdlist, &showmipscmdlist,
-                       NULL, NULL);
+                       NULL, NULL, &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to override the ABI. */
   c = add_set_enum_cmd