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

	* cli/cli-decode.c (add_setshow_enum_cmd, add_setshow_cmd_full)
	(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): Replace
	print string parameter with fprint_setshow function.
	* command.h (fprint_setshow_ftype): Define.  Update declarations.
	* cli/cli-setshow.c (do_setshow_command): When fprint_setshow is
	available, use that.
	* cli/cli-decode.h (struct cmd_list_element): Add field
	fprint_setshow.
	* complaints.c (fprint_setshow_complaints): New function.
	(_initialize_complaints): Pass to add_setshow_zinteger_cmd.
	* hppa-tdep.c (_initialize_hppa_tdep): Replace "print" parameter
	with NULL.
	* mips-tdep.c (_initialize_mips_tdep): Ditto.
	* m32r-rom.c (_initialize_m32r_rom): Ditto.
	* cris-tdep.c (_initialize_cris_tdep): Ditto.
	* arm-tdep.c (_initialize_arm_tdep): Ditto.
	* remote-rdi.c (_initialize_remote_rdi): Ditto.
	* alpha-tdep.c (_initialize_alpha_tdep): Ditto.
	* dwarf2read.c (_initialize_dwarf2_read): Ditto.
	* frame.c (_initialize_frame): Ditto.
	* target.c (initialize_targets): Ditto.
	* maint.c (_initialize_maint_cmds): Ditto.
	* observer.c (_initialize_observer): Ditto.
	* infcall.c (_initialize_infcall): Ditto.
	* breakpoint.c (_initialize_breakpoint): Ditto.
	* cli/cli-logging.c (_initialize_cli_logging): Ditto.
	* remote.c (add_packet_config_cmd, _initialize_remote): Ditto.

1 files changed, 14 insertions, 7 deletions

diff --git a/gdb/command.h b/gdb/command.h
index 5b7a5424c29..355355eb9f9 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -223,6 +223,13 @@ extern struct cmd_list_element *add_set_enum_cmd (char *name,
 						  const char **var,
 						  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);
+
 extern void add_setshow_enum_cmd (char *name,
 				  enum command_class class,
 				  const char *enumlist[],
@@ -230,7 +237,7 @@ extern void add_setshow_enum_cmd (char *name,
 				  const char *set_doc,
 				  const char *show_doc,
 				  const char *help_doc,
-				  const char *print,
+				  fprint_setshow_ftype *fprint_setshow,
 				  cmd_sfunc_ftype *set_func,
 				  cmd_sfunc_ftype *show_func,
 				  struct cmd_list_element **set_list,
@@ -242,7 +249,7 @@ extern void add_setshow_auto_boolean_cmd (char *name,
 					  const char *set_doc,
 					  const char *show_doc,
 					  const char *help_doc,
-					  const char *print,
+					  fprint_setshow_ftype *fprint_setshow,
 					  cmd_sfunc_ftype *set_func,
 					  cmd_sfunc_ftype *show_func,
 					  struct cmd_list_element **set_list,
@@ -252,7 +259,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, const char *print,
+				     const char *help_doc, fprint_setshow_ftype *fprint_setshow,
 				     cmd_sfunc_ftype *set_func,
 				     cmd_sfunc_ftype *show_func,
 				     struct cmd_list_element **set_list,
@@ -264,7 +271,7 @@ extern void add_setshow_filename_cmd (char *name,
 				      const char *set_doc,
 				      const char *show_doc,
 				      const char *help_doc,
-				      const char *print,
+				      fprint_setshow_ftype *fprint_setshow,
 				      cmd_sfunc_ftype *set_func,
 				      cmd_sfunc_ftype *show_func,
 				      struct cmd_list_element **set_list,
@@ -276,7 +283,7 @@ extern void add_setshow_string_cmd (char *name,
 				    const char *set_doc,
 				    const char *show_doc,
 				    const char *help_doc,
-				    const char *print,
+				    fprint_setshow_ftype *fprint_setshow,
 				    cmd_sfunc_ftype *set_func,
 				    cmd_sfunc_ftype *show_func,
 				    struct cmd_list_element **set_list,
@@ -288,7 +295,7 @@ extern void add_setshow_uinteger_cmd (char *name,
 				      const char *set_doc,
 				      const char *show_doc,
 				      const char *help_doc,
-				      const char *print,
+				      fprint_setshow_ftype *fprint_setshow,
 				      cmd_sfunc_ftype *set_func,
 				      cmd_sfunc_ftype *show_func,
 				      struct cmd_list_element **set_list,
@@ -300,7 +307,7 @@ extern void add_setshow_zinteger_cmd (char *name,
 				      const char *set_doc,
 				      const char *show_doc,
 				      const char *help_doc,
-				      const char *print,
+				      fprint_setshow_ftype *fprint_setshow,
 				      cmd_sfunc_ftype *set_func,
 				      cmd_sfunc_ftype *show_func,
 				      struct cmd_list_element **set_list,