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.

1 files changed, 7 insertions, 6 deletions

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 4484281..a98c231 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);
 }