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

	* cli/cli-decode.c (add_setshow_cmd_full, add_setshow_enum_cmd)
	(add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd)
	(add_setshow_filename_cmd, add_setshow_string_cmd)
	(add_setshow_uinteger_cmd, add_setshow_zinteger_cmd): Delete
	fprint_setshow parameter.
	* command.h (fprint_setshow_ftype): Delete.
	(add_setshow_cmd_full, add_setshow_enum_cmd)
	(add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd)
	(add_setshow_filename_cmd, add_setshow_string_cmd)
	(add_setshow_uinteger_cmd, add_setshow_zinteger_cmd): Delete
	fprint_setshow parameter.
	* aix-thread.c, alpha-tdep.c, arm-tdep.c, breakpoint.c: Update.
	* complaints.c, cris-tdep.c, dwarf2read.c, frame.c: Update.
	* hppa-tdep.c, infcall.c, m32r-rom.c, maint.c: Update.
	* mips-tdep.c, nto-tdep.c, observer.c, remote-rdi.c: Update
	* remote.c, target.c, cli/cli-logging.c: Update.

22 files changed, 79 insertions, 74 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e5b0f606e99..16aa4edec03 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,22 @@
+2005-02-17  Andrew Cagney  <cagney@gnu.org>
+
+	* cli/cli-decode.c (add_setshow_cmd_full, add_setshow_enum_cmd)
+	(add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd)
+	(add_setshow_filename_cmd, add_setshow_string_cmd)
+	(add_setshow_uinteger_cmd, add_setshow_zinteger_cmd): Delete
+	fprint_setshow parameter.
+	* command.h (fprint_setshow_ftype): Delete.
+	(add_setshow_cmd_full, add_setshow_enum_cmd)
+	(add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd)
+	(add_setshow_filename_cmd, add_setshow_string_cmd)
+	(add_setshow_uinteger_cmd, add_setshow_zinteger_cmd): Delete
+	fprint_setshow parameter.
+	* aix-thread.c, alpha-tdep.c, arm-tdep.c, breakpoint.c: Update.
+	* complaints.c, cris-tdep.c, dwarf2read.c, frame.c: Update.
+	* hppa-tdep.c, infcall.c, m32r-rom.c, maint.c: Update.
+	* mips-tdep.c, nto-tdep.c, observer.c, remote-rdi.c: Update
+	* remote.c, target.c, cli/cli-logging.c: Update.
+	
 2005-02-16  Andrew Cagney  <cagney@gnu.org>
 
 	Merge setshow print and show parameters.
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index f7a73312c58..11804ed4a22 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -1781,6 +1781,6 @@ _initialize_aix_thread (void)
 			    _("Set debugging of AIX thread module."),
 			    _("Show debugging of AIX thread module."),
 			    _("Enables debugging output (used to debug GDB)."),
-			    NULL, /* FIXME: i18n: Debugging of AIX thread module is \"%d\".  */
-			    NULL, NULL, &setdebuglist, &showdebuglist);
+			    NULL, NULL, /* FIXME: i18n: Debugging of AIX thread module is \"%d\".  */
+			    &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index fc6ee9a5b41..8dc075952c7 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -1592,7 +1592,7 @@ Show the distance searched for the start of a function."), _("\
 If you are debugging a stripped executable, GDB needs to search through the\n\
 program for the start of a function.  This command sets the distance of the\n\
 search.  The only need to set it is when debugging a stripped executable."),
+			    reinit_frame_cache_sfunc,
 			    NULL, /* FIXME: i18n: The distance searched for the start of a function is \"%d\".  */
-			    reinit_frame_cache_sfunc, NULL,
 			    &setlist, &showlist);
 }
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a0892ea98e3..5d72bf3c5b7 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2885,16 +2885,16 @@ _initialize_arm_tdep (void)
 		       _("Set the disassembly style."),
 		       _("Show the disassembly style."),
 		       helptext,
+		       set_disassembly_style_sfunc,
 		       NULL, /* FIXME: i18n: The disassembly style is \"%s\".  */
-		       set_disassembly_style_sfunc, NULL,
 		       &setarmcmdlist, &showarmcmdlist);
 
   add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32,
 			   _("Set usage of ARM 32-bit mode."),
 			   _("Show usage of ARM 32-bit mode."),
 			   _("When off, a 26-bit PC will be used."),
+			   NULL,
 			   NULL, /* FIXME: i18n: Usage of ARM 32-bit mode is %s.  */
-			   NULL, NULL,
 			   &setarmcmdlist, &showarmcmdlist);
 
   /* Add a command to allow the user to force the FPU model.  */
@@ -2906,7 +2906,6 @@ softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n\
 fpa - FPA co-processor (GCC compiled).\n\
 softvfp - Software FP with pure-endian doubles.\n\
 vfp - VFP co-processor."),
-			NULL, /* FIXME: i18n: "The floating point type is \"%s\".  */
 			set_fp_model_sfunc, show_fp_model,
 			&setarmcmdlist, &showarmcmdlist);
 
@@ -2915,7 +2914,7 @@ vfp - VFP co-processor."),
 			   _("Set ARM debugging."),
 			   _("Show ARM debugging."),
 			   _("When on, arm-specific debugging is enabled."),
+			   NULL,
 			   NULL, /* FIXME: i18n: "ARM debugging is %s.  */
-			   NULL, NULL,
 			   &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 2351fcdbd4f..ecc22ffb063 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7961,8 +7961,8 @@ If on, an unrecognized breakpoint location will cause gdb to create a\n\
 pending breakpoint.  If off, an unrecognized breakpoint location results in\n\
 an error.  If auto, an unrecognized breakpoint location results in a\n\
 user-query to see if a pending breakpoint should be created."),
+				NULL,
 				NULL, /* FIXME: i18n: Debugger's behavior regarding pending breakpoints is %s.  */
-				NULL, NULL,
 				&breakpoint_set_cmdlist,
 				&breakpoint_show_cmdlist);
 
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index eb126ef26ba..5d1583d9b6e 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -331,7 +331,6 @@ add_setshow_cmd_full (char *name,
 		      var_types var_type, void *var,
 		      const char *set_doc, const char *show_doc,
 		      const char *help_doc,
-		      fprint_setshow_ftype *fprint_setshow,
 		      cmd_sfunc_ftype *set_func,
 		      show_value_ftype *show_func,
 		      struct cmd_list_element **set_list,
@@ -415,7 +414,6 @@ add_setshow_enum_cmd (char *name,
 		      const char *set_doc,
 		      const char *show_doc,
 		      const char *help_doc,
-		      fprint_setshow_ftype *fprint_setshow,
 		      cmd_sfunc_ftype *set_func,
 		      show_value_ftype *show_func,
 		      struct cmd_list_element **set_list,
@@ -424,7 +422,6 @@ add_setshow_enum_cmd (char *name,
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_enum, var,
 			set_doc, show_doc, help_doc,
-			fprint_setshow,
 			set_func, show_func,
 			set_list, show_list,
 			&c, NULL);
@@ -441,7 +438,6 @@ add_setshow_auto_boolean_cmd (char *name,
 			      enum auto_boolean *var,
 			      const char *set_doc, const char *show_doc,
 			      const char *help_doc,
-			      fprint_setshow_ftype *fprint_setshow,
 			      cmd_sfunc_ftype *set_func,
 			      show_value_ftype *show_func,
 			      struct cmd_list_element **set_list,
@@ -450,7 +446,7 @@ add_setshow_auto_boolean_cmd (char *name,
   static const char *auto_boolean_enums[] = { "on", "off", "auto", NULL };
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_auto_boolean, var,
-			set_doc, show_doc, help_doc, fprint_setshow,
+			set_doc, show_doc, help_doc,
 			set_func, show_func,
 			set_list, show_list,
 			&c, NULL);
@@ -465,7 +461,6 @@ void
 add_setshow_boolean_cmd (char *name, enum command_class class, int *var,
 			 const char *set_doc, const char *show_doc,
 			 const char *help_doc,
-			 fprint_setshow_ftype *fprint_setshow,
 			 cmd_sfunc_ftype *set_func,
 			 show_value_ftype *show_func,
 			 struct cmd_list_element **set_list,
@@ -474,7 +469,7 @@ add_setshow_boolean_cmd (char *name, enum command_class class, int *var,
   static const char *boolean_enums[] = { "on", "off", NULL };
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_boolean, var,
-			set_doc, show_doc, help_doc, fprint_setshow,
+			set_doc, show_doc, help_doc,
 			set_func, show_func,
 			set_list, show_list,
 			&c, NULL);
@@ -488,14 +483,13 @@ add_setshow_filename_cmd (char *name, enum command_class class,
 			  char **var,
 			  const char *set_doc, const char *show_doc,
 			  const char *help_doc,
-			  fprint_setshow_ftype *fprint_setshow,
 			  cmd_sfunc_ftype *set_func,
 			  show_value_ftype *show_func,
 			  struct cmd_list_element **set_list,
 			  struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_filename, var,
-			set_doc, show_doc, help_doc, fprint_setshow,
+			set_doc, show_doc, help_doc,
 			set_func, show_func,
 			set_list, show_list,
 			NULL, NULL);
@@ -508,14 +502,13 @@ add_setshow_string_cmd (char *name, enum command_class class,
 			  char **var,
 			  const char *set_doc, const char *show_doc,
 			  const char *help_doc,
-			fprint_setshow_ftype *fprint_setshow,
 			  cmd_sfunc_ftype *set_func,
 			  show_value_ftype *show_func,
 			  struct cmd_list_element **set_list,
 			  struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_string, var,
-			set_doc, show_doc, help_doc, fprint_setshow,
+			set_doc, show_doc, help_doc,
 			set_func, show_func,
 			set_list, show_list,
 			NULL, NULL);
@@ -530,14 +523,13 @@ add_setshow_uinteger_cmd (char *name, enum command_class class,
 			  unsigned int *var,
 			  const char *set_doc, const char *show_doc,
 			  const char *help_doc,
-			  fprint_setshow_ftype *fprint_setshow,
 			  cmd_sfunc_ftype *set_func,
 			  show_value_ftype *show_func,
 			  struct cmd_list_element **set_list,
 			  struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_uinteger, var,
-			set_doc, show_doc, help_doc, fprint_setshow,
+			set_doc, show_doc, help_doc,
 			set_func, show_func,
 			set_list, show_list,
 			NULL, NULL);
@@ -552,14 +544,13 @@ add_setshow_zinteger_cmd (char *name, enum command_class class,
 			  int *var,
 			  const char *set_doc, const char *show_doc,
 			  const char *help_doc,
-			  fprint_setshow_ftype *fprint_setshow,
 			  cmd_sfunc_ftype *set_func,
 			  show_value_ftype *show_func,
 			  struct cmd_list_element **set_list,
 			  struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_zinteger, var,
-			set_doc, show_doc, help_doc, fprint_setshow,
+			set_doc, show_doc, help_doc,
 			set_func, show_func,
 			set_list, show_list,
 			NULL, NULL);
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 4e04bdf563a..e0f65895686 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -179,21 +179,23 @@ _initialize_cli_logging (void)
 Set whether logging overwrites or appends to the log file."), _("\
 Show whether logging overwrites or appends to the log file."), _("\
 If set, logging overrides the log file."),
+			   NULL,
 			   NULL, /* FIXME: i18n: Whether logging overwrites or appends to the log file is %s.  */
-			   NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
+			   &set_logging_cmdlist, &show_logging_cmdlist);
   add_setshow_boolean_cmd ("redirect", class_support, &logging_redirect, _("\
 Set the logging output mode."), _("\
 Show the logging output mode."), _("\
 If redirect is off, output will go to both the screen and the log file.\n\
 If redirect is on, output will go only to the log file."),
+			   NULL,
 			   NULL, /* FIXME: i18n: The logging output mode is %s.  */
-			   NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
+			   &set_logging_cmdlist, &show_logging_cmdlist);
   add_setshow_filename_cmd ("file", class_support, &logging_filename, _("\
 Set the current logfile."), _("\
 Show the current logfile."), _("\
 The logfile is used when directing GDB's output."),
+			    NULL,
 			    NULL, /* FIXME: i18n: The current logfile is %s.  */
-			    NULL, NULL,
 			    &set_logging_cmdlist, &show_logging_cmdlist);
   add_cmd ("on", class_support, set_logging_on,
 	   _("Enable logging."), &set_logging_cmdlist);
diff --git a/gdb/command.h b/gdb/command.h
index e065dcde541..b0e17a7a09b 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -224,12 +224,6 @@ extern struct cmd_list_element *add_set_enum_cmd (char *name,
 						  char *doc,
 						  struct cmd_list_element **list);
 
-/* Print the set|show CMD's variable's VALUE on FILE.  Do not include
-   a trailing "\n".  */
-typedef void (fprint_setshow_ftype) (struct cmd_list_element *cmd,
-				     struct ui_file *file,
-				     const char *value);
-
 /* Method for show a set/show variable's VALUE on FILE.  If this
    method isn't supplied deprecated_show_value_hack() is called (which
    is not good).  */
@@ -248,7 +242,6 @@ extern void add_setshow_enum_cmd (char *name,
 				  const char *set_doc,
 				  const char *show_doc,
 				  const char *help_doc,
-				  fprint_setshow_ftype *fprint_setshow,
 				  cmd_sfunc_ftype *set_func,
 				  show_value_ftype *show_func,
 				  struct cmd_list_element **set_list,
@@ -260,7 +253,6 @@ extern void add_setshow_auto_boolean_cmd (char *name,
 					  const char *set_doc,
 					  const char *show_doc,
 					  const char *help_doc,
-					  fprint_setshow_ftype *fprint_setshow,
 					  cmd_sfunc_ftype *set_func,
 					  show_value_ftype *show_func,
 					  struct cmd_list_element **set_list,
@@ -270,7 +262,7 @@ extern void add_setshow_boolean_cmd (char *name,
 				     enum command_class class,
 				     int *var,
 				     const char *set_doc, const char *show_doc,
-				     const char *help_doc, fprint_setshow_ftype *fprint_setshow,
+				     const char *help_doc,
 				     cmd_sfunc_ftype *set_func,
 				     show_value_ftype *show_func,
 				     struct cmd_list_element **set_list,
@@ -282,7 +274,6 @@ extern void add_setshow_filename_cmd (char *name,
 				      const char *set_doc,
 				      const char *show_doc,
 				      const char *help_doc,
-				      fprint_setshow_ftype *fprint_setshow,
 				      cmd_sfunc_ftype *set_func,
 				      show_value_ftype *show_func,
 				      struct cmd_list_element **set_list,
@@ -294,7 +285,6 @@ extern void add_setshow_string_cmd (char *name,
 				    const char *set_doc,
 				    const char *show_doc,
 				    const char *help_doc,
-				    fprint_setshow_ftype *fprint_setshow,
 				    cmd_sfunc_ftype *set_func,
 				    show_value_ftype *show_func,
 				    struct cmd_list_element **set_list,
@@ -306,7 +296,6 @@ extern void add_setshow_uinteger_cmd (char *name,
 				      const char *set_doc,
 				      const char *show_doc,
 				      const char *help_doc,
-				      fprint_setshow_ftype *fprint_setshow,
 				      cmd_sfunc_ftype *set_func,
 				      show_value_ftype *show_func,
 				      struct cmd_list_element **set_list,
@@ -318,7 +307,6 @@ extern void add_setshow_zinteger_cmd (char *name,
 				      const char *set_doc,
 				      const char *show_doc,
 				      const char *help_doc,
-				      fprint_setshow_ftype *fprint_setshow,
 				      cmd_sfunc_ftype *set_func,
 				      show_value_ftype *show_func,
 				      struct cmd_list_element **set_list,
diff --git a/gdb/complaints.c b/gdb/complaints.c
index c2084e6cedd..af4be5153e9 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -324,7 +324,6 @@ _initialize_complaints (void)
   add_setshow_zinteger_cmd ("complaints", class_support, &stop_whining, _("\
 Set max number of complaints about incorrect symbols."), _("\
 Show max number of complaints about incorrect symbols."), NULL,
-			    NULL, /* IGNORE */
 			    NULL, complaints_show_value,
 			    &setlist, &showlist);
 }
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index bab63c0e105..23e1fd57fe7 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -3919,8 +3919,8 @@ _initialize_cris_tdep (void)
 			    _("Set the current CRIS version."),
 			    _("Show the current CRIS version."),
 			    _("Set if autodetection fails."),
+			    set_cris_version,
 			    NULL, /* FIXME: i18n: Current CRIS version is %s.  */
-			    set_cris_version, NULL,
 			    &setlist, &showlist);
   
   add_setshow_boolean_cmd ("cris-dwarf2-cfi", class_support,
@@ -3928,8 +3928,8 @@ _initialize_cris_tdep (void)
 			   _("Set the usage of Dwarf-2 CFI for CRIS."),
 			   _("Show the usage of Dwarf-2 CFI for CRIS."),
 			   _("Set to \"off\" if using gcc-cris < R59."),
+			   set_cris_dwarf2_cfi,
 			   NULL, /* FIXME: i18n: Usage of Dwarf-2 CFI for CRIS is %d.  */
-			   set_cris_dwarf2_cfi, NULL,
 			   &setlist, &showlist);
 
   deprecated_add_core_fns (&cris_elf_core_fns);
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index bc430468564..c5bcd4fe2f6 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -9649,7 +9649,8 @@ Show the upper bound on the age of cached dwarf2 compilation units."), _("\
 A higher limit means that cached compilation units will be stored\n\
 in memory longer, and more total memory will be used.  Zero disables\n\
 caching, which can slow down startup."),
+			    NULL,
 			    NULL, /* FIXME: i18n: The upper bound on the age of cached dwarf2 compilation units is %d.  */
-			    NULL, NULL, &set_dwarf2_cmdlist,
+			    &set_dwarf2_cmdlist,
 			    &show_dwarf2_cmdlist);
 }
diff --git a/gdb/frame.c b/gdb/frame.c
index 7a8076bbcea..34adf3de3a3 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1556,8 +1556,9 @@ Show whether backtraces should continue past \"main\"."), _("\
 Normally the caller of \"main\" is not of interest, so GDB will terminate\n\
 the backtrace at \"main\".  Set this variable if you need to see the rest\n\
 of the stack trace."),
+			   NULL,
 			   NULL, /* FIXME: i18n: Whether backtraces should continue past \"main\" is %s.  */
-			   NULL, NULL, &set_backtrace_cmdlist,
+			   &set_backtrace_cmdlist,
 			   &show_backtrace_cmdlist);
 
   add_setshow_boolean_cmd ("past-entry", class_obscure,
@@ -1569,8 +1570,9 @@ Show whether backtraces should continue past the entry point of a program."),
 Normally there are no callers beyond the entry point of a program, so GDB\n\
 will terminate the backtrace there.  Set this variable if you need to see \n\
 the rest of the stack trace."),
+			   NULL,
 			   NULL, /* FIXME: i18n: Whether backtraces should continue past the entry point is %s.  */
-			   NULL, NULL, &set_backtrace_cmdlist,
+			   &set_backtrace_cmdlist,
 			   &show_backtrace_cmdlist);
 
   add_setshow_uinteger_cmd ("limit", class_obscure,
@@ -1579,8 +1581,9 @@ Set an upper bound on the number of backtrace levels."), _("\
 Show the upper bound on the number of backtrace levels."), _("\
 No more than the specified number of frames can be displayed or examined.\n\
 Zero is unlimited."),
+			    NULL,
 			    NULL, /* FIXME: i18n: An upper bound on the number of backtrace levels is %s.  */
-			    NULL, NULL, &set_backtrace_cmdlist,
+			    &set_backtrace_cmdlist,
 			    &show_backtrace_cmdlist);
 
   /* Debug this files internals. */
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 1f987993a09..93f015f72d8 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -2879,6 +2879,7 @@ Show whether hppa target specific debugging information is displayed."), _("\
 This flag controls whether hppa target specific debugging information is\n\
 displayed.  This information is particularly useful for debugging frame\n\
 unwinding problems."),
+			   NULL,
 			   NULL, /* FIXME: i18n: hppa debug flag is %s.  */
-			   NULL, NULL, &setdebuglist, &showdebuglist);
+			   &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/infcall.c b/gdb/infcall.c
index b9bca75a77e..16dafe3ef96 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -886,8 +886,9 @@ information to determine that a function is prototyped.  If this flag is\n\
 set, GDB will perform the conversion for a function it considers\n\
 unprototyped.\n\
 The default is to perform the conversion.\n"),
+			   NULL,
 			   NULL, /* FIXME: i18n: Coercion of floats to doubles when calling functions is %s.  */
-			   NULL, NULL, &setlist, &showlist);
+			   &setlist, &showlist);
 
   add_setshow_boolean_cmd ("unwindonsignal", no_class,
 			   &unwind_on_signal_p, _("\
@@ -897,6 +898,7 @@ The unwindonsignal lets the user determine what gdb should do if a signal\n\
 is received while in a function called from gdb (call dummy).  If set, gdb\n\
 unwinds the stack and restore the context to what as it was before the call.\n\
 The default is to stop in the frame where the signal was received."),
+			   NULL,
 			   NULL, /* FIXME: i18n: Unwinding of stack if a signal is received while in a call dummy is %s.  */
-			   NULL, NULL, &setlist, &showlist);
+			   &setlist, &showlist);
 }
diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index 1f4759210e0..f9cc5e0a7f9 100644
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -563,22 +563,25 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
 Set the default path for downloadable SREC files."), _("\
 Show the default path for downloadable SREC files."), _("\
 Determines the default path for downloadable SREC files."),
+			  NULL,
 			  NULL, /* FIXME: i18n: The default path for downloadable SREC files is %s.  */
-			  NULL, NULL, &setlist, &showlist);
+			  &setlist, &showlist);
 
   add_setshow_string_cmd ("board-address", class_obscure, &board_addr, _("\
 Set IP address for M32R-EVA target board."), _("\
 Show IP address for M32R-EVA target board."), _("\
 Determine the IP address for M32R-EVA target board."),
+			  NULL,
 			  NULL, /* FIXME: i18n: IP address for M32R-EVA target board is %s.  */
-			  NULL, NULL, &setlist, &showlist);
+			  &setlist, &showlist);
 
   add_setshow_string_cmd ("server-address", class_obscure, &server_addr, _("\
 Set IP address for download server (GDB's host computer)."), _("\
 Show IP address for download server (GDB's host computer)."), _("\
 Determine the IP address for download server (GDB's host computer)."),
+			  NULL,
 			  NULL, /* FIXME: i18n: IP address for download server (GDB's host computer) is %s.  */
-			  NULL, NULL, &setlist, &showlist);
+			  &setlist, &showlist);
 
   add_com ("upload", class_obscure, m32r_upload_command, _("\
 Upload the srec file via the monitor's Ethernet upload capability."));
diff --git a/gdb/maint.c b/gdb/maint.c
index a9d0cea33e9..afbcba30faf 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -868,8 +868,8 @@ of time passes without a response from the target, an error occurs.",
 Set internal profiling."), _("\
 Show internal profiling."), _("\
 When enabled GDB is profiled."),
+			   maintenance_set_profile_cmd,
 			   NULL, /* FIXME: i18n: Internal profiling is %s.  */
-			   maintenance_set_profile_cmd, NULL,
 			   &maintenance_set_cmdlist,
 			   &maintenance_show_cmdlist);
 }
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 4484281df89..a98c2315e4d 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -5191,8 +5191,9 @@ This option can be set to one of:\n\
   auto  - Allow GDB to use the target's default setting or autodetect the\n\
           saved GP register size from information contained in the\n\
           executable (default)."),
+			NULL,
 			NULL, /* FIXME: i18n: Size of general purpose registers saved on the stack is %s.  */
-			NULL, NULL, &setmipscmdlist, &showmipscmdlist);
+			&setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to override the argument stack size. */
   add_setshow_enum_cmd ("stack-arg-size", class_obscure,
@@ -5204,8 +5205,9 @@ This option can be set to one of:\n\
   64    - Force GDB to allocate 64-bit chunks per argument\n\
   auto  - Allow GDB to determine the correct setting from the current\n\
           target and executable (default)"),
+			NULL,
 			NULL, /* FIXME: i18n: The amount of stack space reserved for each argument is %s.  */
-			NULL, NULL, &setmipscmdlist, &showmipscmdlist);
+			&setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to override the ABI. */
   c = add_set_enum_cmd
@@ -5256,8 +5258,8 @@ Show the distance searched for the start of a function."), _("\
 If you are debugging a stripped executable, GDB needs to search through the\n\
 program for the start of a function.  This command sets the distance of the\n\
 search.  The only need to set it is when debugging a stripped executable."),
+			    reinit_frame_cache_sfunc,
 			    NULL, /* FIXME: i18n: The distance searched for the start of a function is %s.  */
-			    reinit_frame_cache_sfunc, NULL,
 			    &setlist, &showlist);
 
   /* Allow the user to control whether the upper bits of 64-bit
@@ -5268,7 +5270,6 @@ Set zeroing of upper 32 bits of 64-bit addresses."), _("\
 Show zeroing of upper 32 bits of 64-bit addresses."), _("\
 Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to \n\
 allow GDB to determine the correct value."),
-				NULL, /* FIXME: i18n: Zerroing of upper 32 bits of 64-bit address is %s.  */
 				NULL, show_mask_address,
 				&setmipscmdlist, &showmipscmdlist);
 
@@ -5283,8 +5284,8 @@ Show compatibility with 64-bit MIPS target that transfers 32-bit quantities."),
 Use \"on\" to enable backward compatibility with older MIPS 64 GDB+target\n\
 that would transfer 32 bits for some registers (e.g. SR, FSR) and\n\
 64 bits for others.  Use \"off\" to disable compatibility mode"),
+			   set_mips64_transfers_32bit_regs,
 			   NULL, /* FIXME: i18n: Compatibility with 64-bit MIPS target that transfers 32-bit quantities is %s.  */
-			   set_mips64_transfers_32bit_regs, NULL,
 			   &setlist, &showlist);
 
   /* Debug this files internals. */
@@ -5293,7 +5294,7 @@ that would transfer 32 bits for some registers (e.g. SR, FSR) and\n\
 Set mips debugging."), _("\
 Show mips debugging."), _("\
 When non-zero, mips specific debugging is enabled."),
+			    NULL,
 			    NULL, /* FIXME: i18n: Mips debugging is currently %s.  */
-			    NULL, NULL,
 			    &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 36556ce08ad..e254c484e99 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -382,6 +382,7 @@ Show QNX NTO internal debugging."), _("\
 When non-zero, nto specific debug info is\n\
 displayed. Different information is displayed\n\
 for different positive values."),
+			    NULL,
 			    NULL, /* FIXME: i18n: QNX NTO internal debugging is %s.  */
-			    NULL, NULL, &setdebuglist, &showdebuglist);
+			    &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/observer.c b/gdb/observer.c
index 3509ee57c2a..4064ea8a94f 100644
--- a/gdb/observer.c
+++ b/gdb/observer.c
@@ -204,8 +204,8 @@ _initialize_observer (void)
 Set observer debugging."), _("\
 Show observer debugging."), _("\
 When non-zero, observer debugging is enabled."),
+			    NULL,
 			    NULL, /* FIXME: i18n: Observer debugging is %s.  */
-			    NULL, NULL,
 			    &setdebuglist, &showdebuglist);
 }
 
diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index 28d86891c22..75a6e534ae7 100644
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -994,8 +994,8 @@ Set target has ROM at addr 0."), _("\
 Show if target has ROM at addr 0."), _("\
 A true value disables vector catching, false enables vector catching.\n\
 This is evaluated at the time the 'target rdi' command is executed."),
+			   NULL,
 			   NULL, /* FIXME: i18n: Target has ROM at addr 0 is %s.  */
-			   NULL, NULL,
 			   &setlist, &showlist);
 
   add_setshow_boolean_cmd ("rdiheartbeat", no_class, &rdi_heartbeat, _("\
@@ -1004,8 +1004,8 @@ Show enable for ADP heartbeat packets."), _("\
 I don't know why you would want this. If you enable them,\n\
 it will confuse ARM and EPI JTAG interface boxes as well\n\
 as the Angel Monitor."),
+			   NULL,
 			   NULL, /* FIXME: i18n: Enable for ADP heartbeat packets is %s.  */
-			   NULL, NULL,
 			   &setlist, &showlist);
 }
 
diff --git a/gdb/remote.c b/gdb/remote.c
index 2cca1823702..ac139d60165 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -659,8 +659,7 @@ add_packet_config_cmd (struct packet_config *config,
   /* set/show TITLE-packet {auto,on,off} */
   cmd_name = xstrprintf ("%s-packet", title);
   add_setshow_auto_boolean_cmd (cmd_name, class_obscure,
-				&config->detect, set_doc, show_doc,
-				"", NULL /* FIXME: i18n: Print message is? */,
+				&config->detect, set_doc, show_doc, NULL, /* help_doc */
 				set_func, show_func,
 				set_remote_list, show_remote_list);
   /* set/show remote NAME-packet {auto,on,off} -- legacy.  */
@@ -5624,8 +5623,7 @@ terminating `#' character and checksum."),
 Set whether to send break if interrupted."), _("\
 Show whether to send break if interrupted."), _("\
 If set, a break, instead of a cntrl-c, is sent to the remote target."),
-			   NULL, /* FIXME: i18n: Whether to send break if interrupted is %s.  */
-			   NULL, NULL,
+			   NULL, NULL, /* FIXME: i18n: Whether to send break if interrupted is %s.  */
 			   &setlist, &showlist);
 
   /* Install commands for configuring memory read/write packets.  */
@@ -5666,16 +5664,14 @@ further restriction and ``limit'' to enable that restriction."),
 Set the maximum number of target hardware watchpoints."), _("\
 Show the maximum number of target hardware watchpoints."), _("\
 Specify a negative limit for unlimited."),
-			    NULL, /* FIXME: i18n: The maximum number of target hardware watchpoints is %s.  */
-			    NULL, NULL,
+			    NULL, NULL, /* FIXME: i18n: The maximum number of target hardware watchpoints is %s.  */
 			    &remote_set_cmdlist, &remote_show_cmdlist);
   add_setshow_zinteger_cmd ("hardware-breakpoint-limit", no_class,
 			    &remote_hw_breakpoint_limit, _("\
 Set the maximum number of target hardware breakpoints."), _("\
 Show the maximum number of target hardware breakpoints."), _("\
 Specify a negative limit for unlimited."),
-			    NULL, /* FIXME: i18n: The maximum number of target hardware breakpoints is %s.  */
-			    NULL, NULL,
+			    NULL, NULL, /* FIXME: i18n: The maximum number of target hardware breakpoints is %s.  */
 			    &remote_set_cmdlist, &remote_show_cmdlist);
 
   deprecated_add_show_from_set
@@ -5779,9 +5775,8 @@ Set use of remote protocol `Z' packets"), _("\
 Show use of remote protocol `Z' packets "), _("\
 When set, GDB will attempt to use the remote breakpoint and watchpoint\n\
 packets."),
-				NULL, /* FIXME: i18n: Use of remote protocol `Z' packets is %s.  */
 				set_remote_protocol_Z_packet_cmd,
-				show_remote_protocol_Z_packet_cmd,
+				show_remote_protocol_Z_packet_cmd, /* FIXME: i18n: Use of remote protocol `Z' packets is %s.  */
 				&remote_set_cmdlist, &remote_show_cmdlist);
 
   /* Eventually initialize fileio.  See fileio.c */
diff --git a/gdb/target.c b/gdb/target.c
index 6fa78574184..563008051bc 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -2568,8 +2568,8 @@ Show mode for reading from readonly sections."), _("\
 When this mode is on, memory reads from readonly sections (such as .text)\n\
 will be read from the object file instead of from the target.  This will\n\
 result in significant performance improvement for remote targets."),
+			   NULL,
 			   NULL, /* FIXME: i18n: Mode for reading from readonly sections is %s.  */
-			   NULL, NULL,
 			   &setlist, &showlist);
 
   add_com ("monitor", class_obscure, do_monitor_command,