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

* command.h (deprecated_add_set_cmd): Rename add_set_cmd.
	* cli/cli-decode.h (add_set_cmd): Delete declaration.
	* cli/cli-decode.c (deprecated_add_set_cmd): Rename add_set_cmd.
	* i386-nat.c (_initialize_i386_nat): Update call.
	* valprint.c (_initialize_valprint): Update comment.
	* gnu-nat.c (_initialize_gnu_nat): Update call.

gdb/ChangeLog

@@ -1,3 +1,12 @@
+2005-02-21  Andrew Cagney  <cagney@gnu.org>
+
+	* command.h (deprecated_add_set_cmd): Rename add_set_cmd.
+	* cli/cli-decode.h (add_set_cmd): Delete declaration.
+	* cli/cli-decode.c (deprecated_add_set_cmd): Rename add_set_cmd.
+	* i386-nat.c (_initialize_i386_nat): Update call.
+	* valprint.c (_initialize_valprint): Update comment.
+	* gnu-nat.c (_initialize_gnu_nat): Update call.
+
 2005-02-21  Alan Modra  <amodra@bigpond.net.au>
 
 	* elfread.c (elf_symtab_read): Discard section syms.

gdb/cli/cli-decode.c

@@ -368,12 +368,12 @@ add_setshow_cmd_full (char *name,
 }
 
 struct cmd_list_element *
-add_set_cmd (char *name,
+deprecated_add_set_cmd (char *name,
-	     enum command_class class,
+			enum command_class class,
-	     var_types var_type,
+			var_types var_type,
-	     void *var,
+			void *var,
-	     char *doc,
+			char *doc,
-	     struct cmd_list_element **list)
+			struct cmd_list_element **list)
 {
   return add_set_or_show_cmd (name, set_cmd, class, var_type, var, doc, list);
 }

gdb/cli/cli-decode.h

@@ -286,12 +286,6 @@ extern void delete_cmd (char *, struct cmd_list_element **);
 extern void help_cmd_list (struct cmd_list_element *, enum command_class,
 			   char *, int, struct ui_file *);
 
-extern struct cmd_list_element *add_set_cmd (char *name, enum
-					     command_class class,
-					     var_types var_type, void *var,
-					     char *doc,
-					     struct cmd_list_element **list);
-
 /* Functions that implement commands about CLI commands. */
 
 extern void help_cmd (char *, struct ui_file *);

gdb/command.h

@@ -205,11 +205,15 @@ extern void help_list (struct cmd_list_element *, char *,
 extern void help_cmd_list (struct cmd_list_element *, enum command_class,
 			   char *, int, struct ui_file *);
 
-extern struct cmd_list_element *add_set_cmd (char *name, enum
+/* NOTE: cagney/2005-02-21: Since every set command should be paired
-					     command_class class,
+   with a corresponding show command (i.e., add_setshow_*) this call
-					     var_types var_type, void *var,
+   should not be needed.  Unfortunatly some are not (e.g.,
-					     char *doc,
+   "maintenance <variable> <value>") and those need to be fixed.  */
-					     struct cmd_list_element **list);
+extern struct cmd_list_element *deprecated_add_set_cmd (char *name, enum
+							command_class class,
+							var_types var_type, void *var,
+							char *doc,
+							struct cmd_list_element **list);
 
 /* Method for show a set/show variable's VALUE on FILE.  If this
    method isn't supplied deprecated_show_value_hack() is called (which

gdb/gnu-nat.c

@@ -3371,9 +3371,10 @@ _initialize_gnu_nat (void)
 
   add_task_commands ();
   add_thread_commands ();
-  add_set_cmd ("gnu-debug", class_maintenance,
+  deprecated_add_set_cmd ("gnu-debug", class_maintenance,
-	       var_boolean, (char *) &gnu_debug_flag,
+			  var_boolean, (char *) &gnu_debug_flag,
-	       "Set debugging output for the gnu backend.", &maintenancelist);
+			  "Set debugging output for the gnu backend.",
+			  &maintenancelist);
 }
 
 #ifdef	FLUSH_INFERIOR_CACHE

gdb/i386-nat.c

@@ -670,13 +670,13 @@ _initialize_i386_nat (void)
 #ifdef I386_USE_GENERIC_WATCHPOINTS
   /* A maintenance command to enable printing the internal DRi mirror
      variables.  */
-  add_set_cmd ("show-debug-regs", class_maintenance,
+  deprecated_add_set_cmd ("show-debug-regs", class_maintenance,
-	       var_boolean, (char *) &maint_show_dr,
+			  var_boolean, (char *) &maint_show_dr, _("\
-	       "\
 Set whether to show variables that mirror the x86 debug registers.\n\
 Use \"on\" to enable, \"off\" to disable.\n\
 If enabled, the debug registers values are shown when GDB inserts\n\
 or removes a hardware breakpoint or watchpoint, and when the inferior\n\
-triggers a breakpoint or watchpoint.", &maintenancelist);
+triggers a breakpoint or watchpoint."),
+			  &maintenancelist);
 #endif
 }

gdb/valprint.c

@@ -1274,8 +1274,10 @@ Show default output radix for printing of values."), NULL,
   /* The "set radix" and "show radix" commands are special in that
      they are like normal set and show commands but allow two normally
      independent variables to be either set or shown with a single
-     command.  So the usual deprecated_add_set_cmd() and
+     command.  So the usual deprecated_add_set_cmd() and [deleted]
      add_show_from_set() commands aren't really appropriate. */
+  /* FIXME: i18n: With the new add_setshow_integer command, that is no
+     longer true - show can display anything.  */
   add_cmd ("radix", class_support, set_radix, _("\
 Set default input and output number radices.\n\
 Use 'set input-radix' or 'set output-radix' to independently set each.\n\