Revert 2009-08-07 changes for PR gdb/8869:

[deliverable/binutils-gdb.git] / gdb / cli / cli-decode.c

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index b547ba9f0705b5073bc99b436a665a83c44a431f..3e4f6f57f9a01ca01e3308b8e7dadb8e3502c538 100644 (file)
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -494,9 +494,8 @@ add_setshow_filename_cmd (char *name, enum command_class class,
 }
 
 /* Add element named NAME to both the set and show command LISTs (the
-   list for set/show or some sublist thereof).  Return the new "set"
-   command.  */
-struct cmd_list_element *
+   list for set/show or some sublist thereof).  */
+void
 add_setshow_string_cmd (char *name, enum command_class class,
                        char **var,
                        const char *set_doc, const char *show_doc,
@@ -506,19 +505,16 @@ add_setshow_string_cmd (char *name, enum command_class class,
                        struct cmd_list_element **set_list,
                        struct cmd_list_element **show_list)
 {
-  struct cmd_list_element *cmd;
   add_setshow_cmd_full (name, class, var_string, var,
                        set_doc, show_doc, help_doc,
                        set_func, show_func,
                        set_list, show_list,
-                       &cmd, NULL);
-  return cmd;
+                       NULL, NULL);
 }
 
 /* Add element named NAME to both the set and show command LISTs (the
-   list for set/show or some sublist thereof).  Return the new "set"
-   command.  */
-struct cmd_list_element *
+   list for set/show or some sublist thereof).  */
+void
 add_setshow_string_noescape_cmd (char *name, enum command_class class,
                                 char **var,
                                 const char *set_doc, const char *show_doc,
@@ -528,13 +524,11 @@ add_setshow_string_noescape_cmd (char *name, enum command_class class,
                                 struct cmd_list_element **set_list,
                                 struct cmd_list_element **show_list)
 {
-  struct cmd_list_element *cmd;
   add_setshow_cmd_full (name, class, var_string_noescape, var,
                        set_doc, show_doc, help_doc,
                        set_func, show_func,
                        set_list, show_list,
-                       &cmd, NULL);
-  return cmd;
+                       NULL, NULL);
 }
 
 /* Add element named NAME to both the set and show command LISTs (the
@@ -564,9 +558,8 @@ add_setshow_optional_filename_cmd (char *name, enum command_class class,
 /* Add element named NAME to both the set and show command LISTs (the
    list for set/show or some sublist thereof).  CLASS is as in
    add_cmd.  VAR is address of the variable which will contain the
-   value.  SET_DOC and SHOW_DOC are the documentation strings.  Return
-   the new "set" command.  */
-struct cmd_list_element *
+   value.  SET_DOC and SHOW_DOC are the documentation strings.  */
+void
 add_setshow_integer_cmd (char *name, enum command_class class,
                         int *var,
                         const char *set_doc, const char *show_doc,
@@ -576,21 +569,18 @@ add_setshow_integer_cmd (char *name, enum command_class class,
                         struct cmd_list_element **set_list,
                         struct cmd_list_element **show_list)
 {
-  struct cmd_list_element *cmd;
   add_setshow_cmd_full (name, class, var_integer, var,
                        set_doc, show_doc, help_doc,
                        set_func, show_func,
                        set_list, show_list,
-                       &cmd, NULL);
-  return cmd;
+                       NULL, NULL);
 }
 
 /* Add element named NAME to both the set and show command LISTs (the
    list for set/show or some sublist thereof).  CLASS is as in
    add_cmd.  VAR is address of the variable which will contain the
-   value.  SET_DOC and SHOW_DOC are the documentation strings.  Return
-   the new "set" command.  */
-struct cmd_list_element *
+   value.  SET_DOC and SHOW_DOC are the documentation strings.  */
+void
 add_setshow_uinteger_cmd (char *name, enum command_class class,
                          unsigned int *var,
                          const char *set_doc, const char *show_doc,
@@ -600,21 +590,18 @@ add_setshow_uinteger_cmd (char *name, enum command_class class,
                          struct cmd_list_element **set_list,
                          struct cmd_list_element **show_list)
 {
-  struct cmd_list_element *cmd;
   add_setshow_cmd_full (name, class, var_uinteger, var,
                        set_doc, show_doc, help_doc,
                        set_func, show_func,
                        set_list, show_list,
-                       &cmd, NULL);
-  return cmd;
+                       NULL, NULL);
 }
 
 /* Add element named NAME to both the set and show command LISTs (the
    list for set/show or some sublist thereof).  CLASS is as in
    add_cmd.  VAR is address of the variable which will contain the
-   value.  SET_DOC and SHOW_DOC are the documentation strings.  Return
-   the new "set" command.  */
-struct cmd_list_element *
+   value.  SET_DOC and SHOW_DOC are the documentation strings.  */
+void
 add_setshow_zinteger_cmd (char *name, enum command_class class,
                          int *var,
                          const char *set_doc, const char *show_doc,
@@ -624,21 +611,18 @@ add_setshow_zinteger_cmd (char *name, enum command_class class,
                          struct cmd_list_element **set_list,
                          struct cmd_list_element **show_list)
 {
-  struct cmd_list_element *cmd;
   add_setshow_cmd_full (name, class, var_zinteger, var,
                        set_doc, show_doc, help_doc,
                        set_func, show_func,
                        set_list, show_list,
-                       &cmd, NULL);
-  return cmd;
+                       NULL, NULL);
 }
 
 /* Add element named NAME to both the set and show command LISTs (the
    list for set/show or some sublist thereof).  CLASS is as in
    add_cmd.  VAR is address of the variable which will contain the
-   value.  SET_DOC and SHOW_DOC are the documentation strings.  Return
-   the new "set" command.  */
-struct cmd_list_element *
+   value.  SET_DOC and SHOW_DOC are the documentation strings.  */
+void
 add_setshow_zuinteger_cmd (char *name, enum command_class class,
                           unsigned int *var,
                           const char *set_doc, const char *show_doc,
@@ -648,13 +632,11 @@ add_setshow_zuinteger_cmd (char *name, enum command_class class,
                           struct cmd_list_element **set_list,
                           struct cmd_list_element **show_list)
 {
-  struct cmd_list_element *cmd;
   add_setshow_cmd_full (name, class, var_zuinteger, var,
                        set_doc, show_doc, help_doc,
                        set_func, show_func,
                        set_list, show_list,
-                       &cmd, NULL);
-  return cmd;
+                       NULL, NULL);
 }
 
 /* Remove the command named NAME from the command list.  Return the