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.

2 files changed, 11 insertions, 18 deletions

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);