From cb1a6d5f515a44ffcdc3bbf20c2e01ee8a37670d Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 26 Jul 2004 14:53:06 +0000 Subject: [PATCH] 2004-07-26 Andrew Cagney * cli/cli-decode.c (deprecated_add_show_from_set): Deprecate. * xcoffsolib.c (_initialize_xcoffsolib): Update. * wince.c (_initialize_wince): Update. * win32-nat.c (_initialize_win32_nat): Update. * varobj.c (_initialize_varobj): Update. * valops.c (_initialize_valops): Update. * utils.c (initialize_utils, initialize_utils): Update. * tui/tui-win.c (_initialize_tui_win): Update. * top.c (init_main): Update. * symfile.c (_initialize_symfile): Update. * source.c (_initialize_source): Update. * somsolib.c (_initialize_som_solib): Update. * solib.c (_initialize_solib): Update. * solib-frv.c (_initialize_frv_solib): Update. * serial.c (_initialize_serial): Update. * ser-go32.c (_initialize_ser_dos, _initialize_ser_dos): Update. * remote.c (_initialize_remote, _initialize_remote): Update. * remote-vx.c (_initialize_vx): Update. * remote-utils.c (_initialize_sr_support): Update. * remote-sds.c (_initialize_remote_sds): Update. * remote-mips.c (_initialize_remote_mips): Update. * remote-e7000.c (_initialize_remote_e7000): Update. * proc-api.c (_initialize_proc_api): Update. * printcmd.c: Update. * parse.c (_initialize_parse): Update. * pa64solib.c (_initialize_pa64_solib): Update. * p-valprint.c (_initialize_pascal_valprint): Update. * monitor.c (_initialize_remote_monitors): Update. * mips-tdep.c (_initialize_mips_tdep): Update. * mcore-tdep.c (_initialize_mcore_tdep): Update. * maint.c (_initialize_maint_cmds): Update. * lin-lwp.c (_initialize_lin_lwp): Update. * language.c (_initialize_language): Update. * kod.c (_initialize_kod): Update. * infrun.c (set_schedlock_func, _initialize_infrun): Update. * i386-tdep.c (_initialize_i386_tdep): Update. * gdbtypes.c (build_gdbtypes, _initialize_gdbtypes): Update. * gdbarch.sh: Update. * gdbarch.c: Re-generate. * gdb-events.sh: Update. * gdb-events.c: Re-generate. * frame.c (_initialize_frame): Update. * exec.c: Update. * demangle.c (_initialize_demangler): Update. * dcache.c (_initialize_dcache): Update. * cris-tdep.c (_initialize_cris_tdep, cris_version_update): Update. * cp-valprint.c (_initialize_cp_valprint): Update. * corefile.c (_initialize_core): Update. * command.h: Update. * cli/cli-decode.h: Update. * cli/cli-cmds.c (init_cli_cmds): Update. * charset.c (_initialize_charset): Update. * breakpoint.c (_initialize_breakpoint): Update. * arm-tdep.c (_initialize_arm_tdep_initialize_arm_tdep): Update. * alpha-tdep.c (_initialize_alpha_tdep): Update. * aix-thread.c (_initialize_aix_thread): Update. --- gdb/ChangeLog | 59 +++++++++++++++++++++++ gdb/aix-thread.c | 13 ++--- gdb/alpha-tdep.c | 2 +- gdb/arm-tdep.c | 7 +-- gdb/breakpoint.c | 2 +- gdb/charset.c | 4 +- gdb/cli/cli-cmds.c | 41 ++++++++-------- gdb/cli/cli-decode.c | 18 +++---- gdb/cli/cli-decode.h | 5 +- gdb/cli/cli-dump.c | 4 +- gdb/command.h | 22 ++++----- gdb/corefile.c | 2 +- gdb/cp-valprint.c | 6 +-- gdb/cris-tdep.c | 38 ++++++++------- gdb/dcache.c | 2 +- gdb/demangle.c | 2 +- gdb/exec.c | 2 +- gdb/frame.c | 7 +-- gdb/gdb-events.c | 18 +++---- gdb/gdb-events.sh | 18 +++---- gdb/gdbarch.c | 15 +++--- gdb/gdbarch.sh | 15 +++--- gdb/gdbtypes.c | 13 +++-- gdb/hppa-tdep.c | 8 ++-- gdb/i386-tdep.c | 4 +- gdb/infcmd.c | 2 +- gdb/infrun.c | 25 +++++----- gdb/kod.c | 19 ++++---- gdb/language.c | 8 ++-- gdb/lin-lwp.c | 7 +-- gdb/maint.c | 16 ++++--- gdb/mcore-tdep.c | 9 ++-- gdb/mips-tdep.c | 30 +++++++----- gdb/monitor.c | 13 ++--- gdb/ocd.c | 9 ++-- gdb/p-valprint.c | 2 +- gdb/pa64solib.c | 4 +- gdb/parse.c | 12 ++--- gdb/printcmd.c | 22 ++++----- gdb/proc-api.c | 4 +- gdb/remote-e7000.c | 9 ++-- gdb/remote-mips.c | 70 ++++++++++++++------------- gdb/remote-sds.c | 9 ++-- gdb/remote-utils.c | 9 ++-- gdb/remote-vx.c | 2 +- gdb/remote.c | 4 +- gdb/ser-go32.c | 110 +++++++++++++++++++++---------------------- gdb/serial.c | 17 +++---- gdb/solib-frv.c | 9 ++-- gdb/solib.c | 6 +-- gdb/somsolib.c | 4 +- gdb/source.c | 2 +- gdb/symfile.c | 6 +-- gdb/target.c | 2 +- gdb/top.c | 22 ++++----- gdb/tui/tui-win.c | 6 +-- gdb/utils.c | 12 ++--- gdb/valops.c | 4 +- gdb/valprint.c | 28 +++++------ gdb/varobj.c | 2 +- gdb/win32-nat.c | 89 ++++++++++++++++++---------------- gdb/wince.c | 14 +++--- gdb/windows-nat.c | 89 ++++++++++++++++++---------------- gdb/xcoffsolib.c | 2 +- 64 files changed, 571 insertions(+), 465 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 26c6c8474c6..3cb6e68e2ef 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,62 @@ +2004-07-26 Andrew Cagney + + * cli/cli-decode.c (deprecated_add_show_from_set): Deprecate. + * xcoffsolib.c (_initialize_xcoffsolib): Update. + * wince.c (_initialize_wince): Update. + * win32-nat.c (_initialize_win32_nat): Update. + * varobj.c (_initialize_varobj): Update. + * valops.c (_initialize_valops): Update. + * utils.c (initialize_utils, initialize_utils): Update. + * tui/tui-win.c (_initialize_tui_win): Update. + * top.c (init_main): Update. + * symfile.c (_initialize_symfile): Update. + * source.c (_initialize_source): Update. + * somsolib.c (_initialize_som_solib): Update. + * solib.c (_initialize_solib): Update. + * solib-frv.c (_initialize_frv_solib): Update. + * serial.c (_initialize_serial): Update. + * ser-go32.c (_initialize_ser_dos, _initialize_ser_dos): Update. + * remote.c (_initialize_remote, _initialize_remote): Update. + * remote-vx.c (_initialize_vx): Update. + * remote-utils.c (_initialize_sr_support): Update. + * remote-sds.c (_initialize_remote_sds): Update. + * remote-mips.c (_initialize_remote_mips): Update. + * remote-e7000.c (_initialize_remote_e7000): Update. + * proc-api.c (_initialize_proc_api): Update. + * printcmd.c: Update. + * parse.c (_initialize_parse): Update. + * pa64solib.c (_initialize_pa64_solib): Update. + * p-valprint.c (_initialize_pascal_valprint): Update. + * monitor.c (_initialize_remote_monitors): Update. + * mips-tdep.c (_initialize_mips_tdep): Update. + * mcore-tdep.c (_initialize_mcore_tdep): Update. + * maint.c (_initialize_maint_cmds): Update. + * lin-lwp.c (_initialize_lin_lwp): Update. + * language.c (_initialize_language): Update. + * kod.c (_initialize_kod): Update. + * infrun.c (set_schedlock_func, _initialize_infrun): Update. + * i386-tdep.c (_initialize_i386_tdep): Update. + * gdbtypes.c (build_gdbtypes, _initialize_gdbtypes): Update. + * gdbarch.sh: Update. + * gdbarch.c: Re-generate. + * gdb-events.sh: Update. + * gdb-events.c: Re-generate. + * frame.c (_initialize_frame): Update. + * exec.c: Update. + * demangle.c (_initialize_demangler): Update. + * dcache.c (_initialize_dcache): Update. + * cris-tdep.c (_initialize_cris_tdep, cris_version_update): Update. + * cp-valprint.c (_initialize_cp_valprint): Update. + * corefile.c (_initialize_core): Update. + * command.h: Update. + * cli/cli-decode.h: Update. + * cli/cli-cmds.c (init_cli_cmds): Update. + * charset.c (_initialize_charset): Update. + * breakpoint.c (_initialize_breakpoint): Update. + * arm-tdep.c (_initialize_arm_tdep_initialize_arm_tdep): Update. + * alpha-tdep.c (_initialize_alpha_tdep): Update. + * aix-thread.c (_initialize_aix_thread): Update. + 2004-07-24 Mark Kettenis Partial fix for PR backtrace/1718. diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index 1b625bd3be9..32c67c5cc8b 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -1743,10 +1743,11 @@ _initialize_aix_thread (void) target_new_objfile_chain = deprecated_target_new_objfile_hook; deprecated_target_new_objfile_hook = new_objfile; - add_show_from_set (add_set_cmd ("aix-thread", no_class, var_zinteger, - (char *) &debug_aix_thread, - "Set debugging of AIX thread module.\n" - "Enables printf debugging output.\n", - &setdebuglist), - &showdebuglist); + deprecated_add_show_from_set + (add_set_cmd ("aix-thread", no_class, var_zinteger, + (char *) &debug_aix_thread, + "Set debugging of AIX thread module.\n" + "Enables printf debugging output.\n", + &setdebuglist), + &showdebuglist); } diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index b5edce1bced..12c7a50284a 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -1621,5 +1621,5 @@ search. The only need to set it is when debugging a stripped executable.", /* We need to throw away the frame cache when we set this, since it might change our ability to get backtraces. */ set_cmd_sfunc (c, reinit_frame_cache_sfunc); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); } diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 93678982036..b44768cdaad 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -2930,7 +2930,7 @@ _initialize_arm_tdep (void) &setlist); set_cmd_sfunc (new_set, set_disassembly_style_sfunc); deprecate_cmd (new_set, "set arm disassembly"); - deprecate_cmd (add_show_from_set (new_set, &showlist), + deprecate_cmd (deprecated_add_show_from_set (new_set, &showlist), "show arm disassembly"); /* And now add the new interface. */ @@ -2939,7 +2939,7 @@ _initialize_arm_tdep (void) helptext, &setarmcmdlist); set_cmd_sfunc (new_set, set_disassembly_style_sfunc); - add_show_from_set (new_set, &showarmcmdlist); + deprecated_add_show_from_set (new_set, &showarmcmdlist); add_setshow_cmd_full ("apcs32", no_class, var_boolean, (char *) &arm_apcs_32, @@ -2969,7 +2969,8 @@ _initialize_arm_tdep (void) "vfp - VFP co-processor.", &setarmcmdlist); set_cmd_sfunc (new_set, set_fp_model_sfunc); - set_cmd_sfunc (add_show_from_set (new_set, &showarmcmdlist), show_fp_model); + set_cmd_sfunc (deprecated_add_show_from_set (new_set, &showarmcmdlist), + show_fp_model); /* Add the deprecated "othernames" command. */ deprecate_cmd (add_com ("othernames", class_obscure, arm_othernames, diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 94665bcb46a..eeb4544f11d 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8068,7 +8068,7 @@ such is available. (However, any hardware watchpoints that were\n\ created before setting this to nonzero, will continue to use watchpoint\n\ hardware.)", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); can_use_hw_watchpoints = 1; diff --git a/gdb/charset.c b/gdb/charset.c index 2005a49e009..89e3b75d633 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -1257,7 +1257,7 @@ _initialize_charset (void) set_cmd_sfunc (new_cmd, set_host_charset_sfunc); - add_show_from_set (new_cmd, &showlist); + deprecated_add_show_from_set (new_cmd, &showlist); @@ -1273,5 +1273,5 @@ _initialize_charset (void) &setlist); set_cmd_sfunc (new_cmd, set_target_charset_sfunc); - add_show_from_set (new_cmd, &showlist); + deprecated_add_show_from_set (new_cmd, &showlist); } diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 3dfb303913b..ffb2cd8b6eb 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1119,7 +1119,7 @@ when gdb is started.", &cmdlist); c = add_set_cmd ("verbose", class_support, var_boolean, (char *) &info_verbose, "Set ", &setlist), - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_verbose); set_verbose (NULL, 0, c); @@ -1130,7 +1130,7 @@ when gdb is started.", &cmdlist); "Generic command for showing command history parameters.", &showhistlist, "show history ", 0, &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("expansion", no_class, var_boolean, (char *) &history_expansion_p, "Set history expansion on command input.\n\ Without an argument, history expansion is enabled.", &sethistlist), @@ -1174,9 +1174,10 @@ is used, the same rules apply to its nested commands as to the first ones."); /* If target is open when baud changes, it doesn't take effect until the next open (I think, not sure). */ - add_show_from_set (add_set_cmd ("remotebaud", no_class, - var_zinteger, (char *) &baud_rate, - "Set baud rate for remote serial I/O.\n\ + deprecated_add_show_from_set + (add_set_cmd ("remotebaud", no_class, + var_zinteger, (char *) &baud_rate, + "Set baud rate for remote serial I/O.\n\ This value is used to set the speed of the serial port when debugging\n\ using remote targets.", &setlist), &showlist); @@ -1187,21 +1188,23 @@ using remote targets.", &setlist), When enabled, each packet sent or received with the remote target\n\ is displayed.", &setlist); deprecate_cmd (c, "set debug remote"); - deprecate_cmd (add_show_from_set (c, &showlist), "show debug remote"); + deprecate_cmd (deprecated_add_show_from_set (c, &showlist), + "show debug remote"); - add_show_from_set (add_set_cmd ("remote", no_class, var_zinteger, - (char *) &remote_debug, - "Set debugging of remote protocol.\n\ + deprecated_add_show_from_set + (add_set_cmd ("remote", no_class, var_zinteger, + (char *) &remote_debug, + "Set debugging of remote protocol.\n\ When enabled, each packet sent or received with the remote target\n\ is displayed.", &setdebuglist), &showdebuglist); - add_show_from_set ( - add_set_cmd ("remotetimeout", no_class, var_integer, (char *) &remote_timeout, - "Set timeout limit to wait for target to respond.\n\ + deprecated_add_show_from_set + (add_set_cmd ("remotetimeout", no_class, var_integer, (char *) &remote_timeout, + "Set timeout limit to wait for target to respond.\n\ This value is used to set the time limit for gdb to wait for a response\n\ from the target.", &setlist), - &showlist); + &showlist); add_prefix_cmd ("debug", no_class, set_debug, "Generic command for setting gdb debugging flags", @@ -1279,10 +1282,10 @@ Argument is the name of the user defined command.\n\ With no argument, show definitions of all user defined commands.", &showlist); add_com ("apropos", class_support, apropos_command, "Search for commands matching a REGEXP"); - add_show_from_set ( - add_set_cmd ("max-user-call-depth", no_class, var_integer, - (char *) &max_user_call_depth, - "Set the max call depth for user-defined commands.\n", - &setlist), - &showlist); + deprecated_add_show_from_set + (add_set_cmd ("max-user-call-depth", no_class, var_integer, + (char *) &max_user_call_depth, + "Set the max call depth for user-defined commands.\n", + &setlist), + &showlist); } diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 2b5d68b30d5..fb755a6c438 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -495,16 +495,16 @@ add_setshow_zinteger_cmd (char *name, /* Where SETCMD has already been added, add the corresponding show command to LIST and return a pointer to the added command (not necessarily the head of LIST). */ -/* NOTE: cagney/2002-03-17: The original version of add_show_from_set - used memcpy() to clone `set' into `show'. This meant that in - addition to all the needed fields (var, name, et.al.) some - unnecessary fields were copied (namely the callback function). The - function explictly copies relevant fields. For a `set' and `show' - command to share the same callback, the caller must set both - explicitly. */ +/* NOTE: cagney/2002-03-17: The original version of + deprecated_add_show_from_set used memcpy() to clone `set' into + `show'. This meant that in addition to all the needed fields (var, + name, et.al.) some unnecessary fields were copied (namely the + callback function). The function explictly copies relevant fields. + For a `set' and `show' command to share the same callback, the + caller must set both explicitly. */ struct cmd_list_element * -add_show_from_set (struct cmd_list_element *setcmd, - struct cmd_list_element **list) +deprecated_add_show_from_set (struct cmd_list_element *setcmd, + struct cmd_list_element **list) { char *doc; const static char setstring[] = "Set "; diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h index d8ab67d49f0..97e71063973 100644 --- a/gdb/cli/cli-decode.h +++ b/gdb/cli/cli-decode.h @@ -295,9 +295,8 @@ extern struct cmd_list_element *add_set_enum_cmd (char *name, char *doc, struct cmd_list_element **list); -extern struct cmd_list_element *add_show_from_set (struct cmd_list_element *, - struct cmd_list_element - **); +extern struct cmd_list_element *deprecated_add_show_from_set (struct cmd_list_element *, + struct cmd_list_element **); /* Functions that implement commands about CLI commands. */ diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c index ac54aa675b9..84b4a6d469a 100644 --- a/gdb/cli/cli-dump.c +++ b/gdb/cli/cli-dump.c @@ -427,8 +427,8 @@ add_dump_command (char *name, void (*func) (char *args, char *mode), set_cmd_context (c, d); c->func = call_dump_func; - /* Replace "Dump " at start of docstring with "Append " - (borrowed from add_show_from_set). */ + /* Replace "Dump " at start of docstring with "Append " (borrowed + from deprecated_add_show_from_set). */ if ( c->doc[0] == 'W' && c->doc[1] == 'r' && c->doc[2] == 'i' diff --git a/gdb/command.h b/gdb/command.h index d441a7f481f..e2a44b2a033 100644 --- a/gdb/command.h +++ b/gdb/command.h @@ -153,14 +153,15 @@ extern void execute_cmd_pre_hook (struct cmd_list_element *cmd); extern void execute_cmd_post_hook (struct cmd_list_element *cmd); /* Return the type of the command. */ -/* NOTE: cagney/2002-03-17: The add_show_from_set() function clones - the set command passed as a parameter. The clone operation will - include (BUG?) any ``set'' command callback, if present. Commands - like ``info set'' call all the ``show'' command callbacks. - Unfortunately, for ``show'' commands cloned from ``set'', this - includes callbacks belonging to ``set'' commands. Making this - worse, this only occures if add_show_from_set() is called after - add_cmd_sfunc() (BUG?). */ +/* NOTE: cagney/2002-03-17: The deprecated_add_show_from_set() + function clones the set command passed as a parameter. The clone + operation will include (BUG?) any ``set'' command callback, if + present. Commands like ``info set'' call all the ``show'' command + callbacks. Unfortunately, for ``show'' commands cloned from + ``set'', this includes callbacks belonging to ``set'' commands. + Making this worse, this only occures if + deprecated_add_show_from_set() is called after add_cmd_sfunc() + (BUG?). */ extern enum cmd_types cmd_type (struct cmd_list_element *cmd); @@ -282,9 +283,8 @@ extern void add_setshow_zinteger_cmd (char *name, struct cmd_list_element **set_list, struct cmd_list_element **show_list); -extern struct cmd_list_element *add_show_from_set (struct cmd_list_element *, - struct cmd_list_element - **); +extern struct cmd_list_element *deprecated_add_show_from_set (struct cmd_list_element *, + struct cmd_list_element **); /* Do a "show" command for each thing on a command list. */ diff --git a/gdb/corefile.c b/gdb/corefile.c index 0ca469b6937..91519b97f63 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -450,7 +450,7 @@ No arg means have no core file. This command has been superseded by the\n\ Use `set gnutarget auto' to specify automatic detection.", &setlist); set_cmd_sfunc (c, set_gnutarget_command); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); if (getenv ("GNUTARGET")) set_gnutarget (getenv ("GNUTARGET")); diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 53e3ce9b2ec..6f9bb353f5f 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -804,7 +804,7 @@ cp_print_hpacc_virtual_table_entries (struct type *type, int *vfuncs, void _initialize_cp_valprint (void) { - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("static-members", class_support, var_boolean, (char *) &static_field_print, "Set printing of C++ static members.", @@ -813,13 +813,13 @@ _initialize_cp_valprint (void) /* Turn on printing of static fields. */ static_field_print = 1; - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("vtbl", class_support, var_boolean, (char *) &vtblprint, "Set printing of C++ virtual function tables.", &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("object", class_support, var_boolean, (char *) &objectprint, "Set printing of object's derived type based on vtable info.", &setprintlist), diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 12f33a82361..029dc4623c1 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -3632,13 +3632,13 @@ _initialize_cris_tdep (void) (char *) &usr_cmd_cris_version, "Set the current CRIS version.", &setlist); set_cmd_sfunc (c, cris_version_update); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); c = add_set_enum_cmd ("cris-mode", class_support, cris_mode_enums, &usr_cmd_cris_mode, "Set the current CRIS mode.", &setlist); set_cmd_sfunc (c, cris_mode_update); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); c = add_cmd ("cris-fpless-backtrace", class_support, cris_fpless_backtrace, "Display call chain using the subroutine return pointer.\n" @@ -3670,14 +3670,15 @@ cris_version_update (char *ignore_args, int from_tty, { struct gdbarch_info info; - /* NOTE: cagney/2002-03-17: The add_show_from_set() function clones - the set command passed as a parameter. The clone operation will - include (BUG?) any ``set'' command callback, if present. - Commands like ``info set'' call all the ``show'' command - callbacks. Unfortunately, for ``show'' commands cloned from - ``set'', this includes callbacks belonging to ``set'' commands. - Making this worse, this only occures if add_show_from_set() is - called after add_cmd_sfunc() (BUG?). */ + /* NOTE: cagney/2002-03-17: The deprecated_add_show_from_set() + function clones the set command passed as a parameter. The clone + operation will include (BUG?) any ``set'' command callback, if + present. Commands like ``info set'' call all the ``show'' + command callbacks. Unfortunately, for ``show'' commands cloned + from ``set'', this includes callbacks belonging to ``set'' + commands. Making this worse, this only occures if + deprecated_add_show_from_set() is called after add_cmd_sfunc() + (BUG?). */ /* From here on, trust the user's CRIS version setting. */ if (cmd_type (c) == set_cmd) @@ -3697,14 +3698,15 @@ cris_mode_update (char *ignore_args, int from_tty, { struct gdbarch_info info; - /* NOTE: cagney/2002-03-17: The add_show_from_set() function clones - the set command passed as a parameter. The clone operation will - include (BUG?) any ``set'' command callback, if present. - Commands like ``info set'' call all the ``show'' command - callbacks. Unfortunately, for ``show'' commands cloned from - ``set'', this includes callbacks belonging to ``set'' commands. - Making this worse, this only occures if add_show_from_set() is - called after add_cmd_sfunc() (BUG?). */ + /* NOTE: cagney/2002-03-17: The deprecated_add_show_from_set() + function clones the set command passed as a parameter. The clone + operation will include (BUG?) any ``set'' command callback, if + present. Commands like ``info set'' call all the ``show'' + command callbacks. Unfortunately, for ``show'' commands cloned + from ``set'', this includes callbacks belonging to ``set'' + commands. Making this worse, this only occures if + deprecated_add_show_from_set() is called after add_cmd_sfunc() + (BUG?). */ /* From here on, trust the user's CRIS mode setting. */ if (cmd_type (c) == set_cmd) diff --git a/gdb/dcache.c b/gdb/dcache.c index ee690948fdc..e3ffa4a9d18 100644 --- a/gdb/dcache.c +++ b/gdb/dcache.c @@ -585,7 +585,7 @@ dcache_info (char *exp, int tty) void _initialize_dcache (void) { - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("remotecache", class_support, var_boolean, (char *) &dcache_enabled_p, "\ diff --git a/gdb/demangle.c b/gdb/demangle.c index bcf9b77de51..423ae7c7e8c 100644 --- a/gdb/demangle.c +++ b/gdb/demangle.c @@ -195,7 +195,7 @@ _initialize_demangler (void) "Set the current C++ demangling style.\n\ Use `set demangle-style' without arguments for a list of demangling styles.", &setlist); - show = add_show_from_set (set, &showlist); + show = deprecated_add_show_from_set (set, &showlist); set_cmd_sfunc (set, set_demangling_command); /* Set the default demangling style chosen at compilation time. */ diff --git a/gdb/exec.c b/gdb/exec.c index 4b43808e246..b1f4f359b39 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -745,7 +745,7 @@ This can be used if the exec file does not contain section addresses,\n\ file itself are wrong. Each section must be changed separately. The\n\ ``info files'' command lists all the sections and their addresses."); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("write", class_support, var_boolean, (char *) &write_files, "Set writing into executable and core files.", &setlist), diff --git a/gdb/frame.c b/gdb/frame.c index dc65a4d8f07..bfc5ae84155 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -2254,8 +2254,9 @@ Show the upper bound on the number of backtrace levels.", &show_backtrace_cmdlist); /* Debug this files internals. */ - add_show_from_set (add_set_cmd ("frame", class_maintenance, var_zinteger, - &frame_debug, "Set frame debugging.\n\ + deprecated_add_show_from_set + (add_set_cmd ("frame", class_maintenance, var_zinteger, + &frame_debug, "Set frame debugging.\n\ When non-zero, frame specific internal debugging is enabled.", &setdebuglist), - &showdebuglist); + &showdebuglist); } diff --git a/gdb/gdb-events.c b/gdb/gdb-events.c index e0916d8706f..42d93bfb020 100644 --- a/gdb/gdb-events.c +++ b/gdb/gdb-events.c @@ -335,13 +335,15 @@ _initialize_gdb_events (void) (char *) (&gdb_events_debug), "Set event debugging.\n\ When non-zero, event/notify debugging is enabled.", &setlist); deprecate_cmd (c, "set debug event"); - deprecate_cmd (add_show_from_set (c, &showlist), "show debug event"); - - add_show_from_set (add_set_cmd ("event", - class_maintenance, - var_zinteger, - (char *) (&gdb_events_debug), - "Set event debugging.\n\ + deprecate_cmd (deprecated_add_show_from_set (c, &showlist), + "show debug event"); + + deprecated_add_show_from_set + (add_set_cmd ("event", + class_maintenance, + var_zinteger, + (char *) (&gdb_events_debug), + "Set event debugging.\n\ When non-zero, event/notify debugging is enabled.", &setdebuglist), - &showdebuglist); + &showdebuglist); } diff --git a/gdb/gdb-events.sh b/gdb/gdb-events.sh index 5be1e54cdfd..4da00a5a059 100755 --- a/gdb/gdb-events.sh +++ b/gdb/gdb-events.sh @@ -474,15 +474,17 @@ cat < form.", - &setprintlist), - &showprintlist); - add_show_from_set ( - add_set_cmd ("symbol-filename", no_class, var_boolean, - (char *) &print_symbol_filename, - "Set printing of source filename and line number with .", - &setprintlist), - &showprintlist); + &setprintlist), + &showprintlist); + deprecated_add_show_from_set + (add_set_cmd ("symbol-filename", no_class, var_boolean, + (char *) &print_symbol_filename, "\ +Set printing of source filename and line number with .", + &setprintlist), + &showprintlist); /* For examine/instruction a single byte quantity is specified as the data. This avoids problems with value_at_lazy() requiring a diff --git a/gdb/proc-api.c b/gdb/proc-api.c index e6d30ea01fe..ec8060ce2bb 100644 --- a/gdb/proc-api.c +++ b/gdb/proc-api.c @@ -784,7 +784,7 @@ _initialize_proc_api (void) var_boolean, (char *) &procfs_trace, "Set tracing for /proc api calls.\n", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_procfs_trace_cmd); set_cmd_completer (c, filename_completer); @@ -792,6 +792,6 @@ _initialize_proc_api (void) (char *) &procfs_filename, "Set filename for /proc tracefile.\n", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_procfs_file_cmd); } diff --git a/gdb/remote-e7000.c b/gdb/remote-e7000.c index be283473a78..c186381fc38 100644 --- a/gdb/remote-e7000.c +++ b/gdb/remote-e7000.c @@ -2188,8 +2188,9 @@ _initialize_remote_e7000 (void) add_com ("drain", class_obscure, e7000_drain_command, "Drain pending e7000 text buffers."); - add_show_from_set (add_set_cmd ("usehardbreakpoints", no_class, - var_integer, (char *) &use_hard_breakpoints, - "Set use of hardware breakpoints for all breakpoints.\n", &setlist), - &showlist); + deprecated_add_show_from_set + (add_set_cmd ("usehardbreakpoints", no_class, + var_integer, (char *) &use_hard_breakpoints, "\ +Set use of hardware breakpoints for all breakpoints.\n", &setlist), + &showlist); } diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index 3742bf67dc1..ae54df9321d 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -3368,54 +3368,56 @@ of the TFTP temporary file, if it differs from the filename seen by the board."; add_target (&ddb_ops); add_target (&lsi_ops); - add_show_from_set ( - add_set_cmd ("timeout", no_class, var_zinteger, - (char *) &mips_receive_wait, - "Set timeout in seconds for remote MIPS serial I/O.", - &setlist), - &showlist); - - add_show_from_set ( - add_set_cmd ("retransmit-timeout", no_class, var_zinteger, - (char *) &mips_retransmit_wait, - "Set retransmit timeout in seconds for remote MIPS serial I/O.\n\ + deprecated_add_show_from_set + (add_set_cmd ("timeout", no_class, var_zinteger, + (char *) &mips_receive_wait, + "Set timeout in seconds for remote MIPS serial I/O.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("retransmit-timeout", no_class, var_zinteger, + (char *) &mips_retransmit_wait, "\ +Set retransmit timeout in seconds for remote MIPS serial I/O.\n\ This is the number of seconds to wait for an acknowledgement to a packet\n\ before resending the packet.", &setlist), - &showlist); + &showlist); - add_show_from_set ( - add_set_cmd ("syn-garbage-limit", no_class, var_zinteger, - (char *) &mips_syn_garbage, - "Set the maximum number of characters to ignore when scanning for a SYN.\n\ + deprecated_add_show_from_set + (add_set_cmd ("syn-garbage-limit", no_class, var_zinteger, + (char *) &mips_syn_garbage, "\ +Set the maximum number of characters to ignore when scanning for a SYN.\n\ This is the maximum number of characters GDB will ignore when trying to\n\ -synchronize with the remote system. A value of -1 means that there is no limit\n\ -(Note that these characters are printed out even though they are ignored.)", - &setlist), - &showlist); +synchronize with the remote system. A value of -1 means that there is no\n\ +limit. (Note that these characters are printed out even though they are\n\ +ignored.)", + &setlist), + &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("monitor-prompt", class_obscure, var_string, (char *) &mips_monitor_prompt, "Set the prompt that GDB expects from the monitor.", &setlist), &showlist); - add_show_from_set ( - add_set_cmd ("monitor-warnings", class_obscure, var_zinteger, - (char *) &monitor_warnings, - "Set printing of monitor warnings.\n" - "When enabled, monitor warnings about hardware breakpoints " - "will be displayed.", - &setlist), - &showlist); + deprecated_add_show_from_set + (add_set_cmd ("monitor-warnings", class_obscure, var_zinteger, + (char *) &monitor_warnings, + "Set printing of monitor warnings.\n" + "When enabled, monitor warnings about hardware breakpoints " + "will be displayed.", + &setlist), + &showlist); add_com ("pmon ", class_obscure, pmon_command, "Send a packet to PMON (must be in debug mode)."); - add_show_from_set (add_set_cmd ("mask-address", no_class, - var_boolean, &mask_address_p, - "Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON targets.\n\ + deprecated_add_show_from_set + (add_set_cmd ("mask-address", no_class, + var_boolean, &mask_address_p, "\ +Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON targets.\n\ Use \"on\" to enable the masking and \"off\" to disable it.\n", - &setlist), - &showlist); + &setlist), + &showlist); } diff --git a/gdb/remote-sds.c b/gdb/remote-sds.c index 01861f076af..967ad3ef3f9 100644 --- a/gdb/remote-sds.c +++ b/gdb/remote-sds.c @@ -1119,10 +1119,11 @@ _initialize_remote_sds (void) init_sds_ops (); add_target (&sds_ops); - add_show_from_set (add_set_cmd ("sdstimeout", no_class, - var_integer, (char *) &sds_timeout, - "Set timeout value for sds read.\n", &setlist), - &showlist); + deprecated_add_show_from_set + (add_set_cmd ("sdstimeout", no_class, + var_integer, (char *) &sds_timeout, + "Set timeout value for sds read.\n", &setlist), + &showlist); add_com ("sds", class_obscure, sds_command, "Send a command to the SDS monitor."); diff --git a/gdb/remote-utils.c b/gdb/remote-utils.c index ba150e34d5d..2f3032c7e0d 100644 --- a/gdb/remote-utils.c +++ b/gdb/remote-utils.c @@ -596,12 +596,13 @@ void _initialize_sr_support (void) { /* FIXME-now: if target is open... */ - add_show_from_set (add_set_cmd ("remotedevice", no_class, - var_filename, (char *) &sr_settings.device, - "Set device for remote serial I/O.\n\ + deprecated_add_show_from_set + (add_set_cmd ("remotedevice", no_class, + var_filename, (char *) &sr_settings.device, + "Set device for remote serial I/O.\n\ This device is used as the serial port when debugging using remote\n\ targets.", &setlist), - &showlist); + &showlist); add_com ("remote ", class_obscure, sr_com, "Send a command to the remote monitor."); diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c index 7895a97e352..a121bedc5cd 100644 --- a/gdb/remote-vx.c +++ b/gdb/remote-vx.c @@ -1391,7 +1391,7 @@ _initialize_vx (void) init_vx_run_ops (); add_target (&vx_run_ops); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("vxworks-timeout", class_support, var_uinteger, (char *) &rpcTimeout.tv_sec, "Set seconds to wait for rpc calls to return.\n\ diff --git a/gdb/remote.c b/gdb/remote.c index 80798ee915e..ad85c072194 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -5475,7 +5475,7 @@ Specify a negative limit for unlimited.", "\ Show the maximum number of target hardware breakpoints.\n", NULL, NULL, &remote_set_cmdlist, &remote_show_cmdlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("remoteaddresssize", class_obscure, var_integer, (char *) &remote_address_size, "Set the maximum size of the address (in bits) \ @@ -5492,7 +5492,7 @@ in a memory packet.\n", #if 0 /* XXXX - should ``set remotebinarydownload'' be retained for compatibility. */ - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("remotebinarydownload", no_class, var_boolean, (char *) &remote_binary_download, "Set binary downloads.\n", &setlist), diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c index cea01cdf221..f9299941976 100644 --- a/gdb/ser-go32.c +++ b/gdb/ser-go32.c @@ -903,61 +903,61 @@ _initialize_ser_dos (void) intrupts[1].inuse = /* keyboard */ intrupts[2].inuse = 1; /* slave icu */ - add_show_from_set ( - add_set_cmd ("com1base", class_obscure, var_zinteger, - (char *) &ports[0].base, - "Set COM1 base i/o port address.", - &setlist), - &showlist); - - add_show_from_set ( - add_set_cmd ("com1irq", class_obscure, var_zinteger, - (char *) &ports[0].irq, - "Set COM1 interrupt request.", - &setlist), - &showlist); - - add_show_from_set ( - add_set_cmd ("com2base", class_obscure, var_zinteger, - (char *) &ports[1].base, - "Set COM2 base i/o port address.", - &setlist), - &showlist); - - add_show_from_set ( - add_set_cmd ("com2irq", class_obscure, var_zinteger, - (char *) &ports[1].irq, - "Set COM2 interrupt request.", - &setlist), - &showlist); - - add_show_from_set ( - add_set_cmd ("com3base", class_obscure, var_zinteger, - (char *) &ports[2].base, - "Set COM3 base i/o port address.", - &setlist), - &showlist); - - add_show_from_set ( - add_set_cmd ("com3irq", class_obscure, var_zinteger, - (char *) &ports[2].irq, - "Set COM3 interrupt request.", - &setlist), - &showlist); - - add_show_from_set ( - add_set_cmd ("com4base", class_obscure, var_zinteger, - (char *) &ports[3].base, - "Set COM4 base i/o port address.", - &setlist), - &showlist); - - add_show_from_set ( - add_set_cmd ("com4irq", class_obscure, var_zinteger, - (char *) &ports[3].irq, - "Set COM4 interrupt request.", - &setlist), - &showlist); + deprecated_add_show_from_set + (add_set_cmd ("com1base", class_obscure, var_zinteger, + (char *) &ports[0].base, + "Set COM1 base i/o port address.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("com1irq", class_obscure, var_zinteger, + (char *) &ports[0].irq, + "Set COM1 interrupt request.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("com2base", class_obscure, var_zinteger, + (char *) &ports[1].base, + "Set COM2 base i/o port address.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("com2irq", class_obscure, var_zinteger, + (char *) &ports[1].irq, + "Set COM2 interrupt request.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("com3base", class_obscure, var_zinteger, + (char *) &ports[2].base, + "Set COM3 base i/o port address.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("com3irq", class_obscure, var_zinteger, + (char *) &ports[2].irq, + "Set COM3 interrupt request.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("com4base", class_obscure, var_zinteger, + (char *) &ports[3].base, + "Set COM4 base i/o port address.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("com4irq", class_obscure, var_zinteger, + (char *) &ports[3].irq, + "Set COM4 interrupt request.", + &setlist), + &showlist); add_info ("serial", dos_info, "Print DOS serial port status."); diff --git a/gdb/serial.c b/gdb/serial.c index 72f02beb593..7311dd8d60d 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -686,7 +686,7 @@ Show default serial/parallel port configuration.", 0/*allow-unknown*/, &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("remotelogfile", no_class, var_filename, (char *) &serial_logfile, "Set filename for remote session recording.\n\ @@ -695,18 +695,19 @@ by gdbserver.", &setlist), &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_enum_cmd ("remotelogbase", no_class, logbase_enums, &serial_logbase, "Set numerical base for remote session logging", &setlist), &showlist); - add_show_from_set (add_set_cmd ("serial", - class_maintenance, - var_zinteger, - (char *)&global_serial_debug_p, - "Set serial debugging.\n\ + deprecated_add_show_from_set + (add_set_cmd ("serial", + class_maintenance, + var_zinteger, + (char *)&global_serial_debug_p, + "Set serial debugging.\n\ When non-zero, serial port debugging is enabled.", &setdebuglist), - &showdebuglist); + &showdebuglist); } diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c index 1784f73b2d2..efdfc86f678 100644 --- a/gdb/solib-frv.c +++ b/gdb/solib-frv.c @@ -1221,10 +1221,11 @@ _initialize_frv_solib (void) current_target_so_ops = &frv_so_ops; /* Debug this file's internals. */ - add_show_from_set (add_set_cmd ("solib-frv", class_maintenance, var_zinteger, - &solib_frv_debug, + deprecated_add_show_from_set + (add_set_cmd ("solib-frv", class_maintenance, var_zinteger, + &solib_frv_debug, "Set internal debugging of shared library code for FR-V.\n" "When non-zero, FR-V solib specific internal debugging is enabled.", - &setdebuglist), - &showdebuglist); + &setdebuglist), + &showdebuglist); } diff --git a/gdb/solib.c b/gdb/solib.c index 137fc709fd4..76d782df59e 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -885,7 +885,7 @@ _initialize_solib (void) add_com ("nosharedlibrary", class_files, no_shared_libraries, "Unload all shared object library symbols."); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("auto-solib-add", class_support, var_boolean, (char *) &auto_solib_add, "Set autoloading of shared library symbols.\n\ @@ -901,7 +901,7 @@ inferior. Otherwise, symbols must be loaded manually, using `sharedlibrary'.", "Set prefix for loading absolute shared library symbol files.\n\ For other (relative) files, you can add values using `set solib-search-path'.", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_cfunc (c, reload_shared_libraries); set_cmd_completer (c, filename_completer); @@ -914,7 +914,7 @@ For other (relative) files, you can add values using `set solib-search-path'.", "Set the search path for loading non-absolute shared library symbol files.\n\ This takes precedence over the environment variables PATH and LD_LIBRARY_PATH.", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_cfunc (c, reload_shared_libraries); set_cmd_completer (c, filename_completer); } diff --git a/gdb/somsolib.c b/gdb/somsolib.c index 00812804a96..4db13a96a51 100644 --- a/gdb/somsolib.c +++ b/gdb/somsolib.c @@ -1583,7 +1583,7 @@ _initialize_som_solib (void) add_info ("sharedlibrary", som_sharedlibrary_info_command, "Status of loaded shared object libraries."); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("auto-solib-add", class_support, var_boolean, (char *) &auto_solib_add, "Set autoloading of shared library symbols.\n\ @@ -1594,7 +1594,7 @@ inferior. Otherwise, symbols must be loaded manually, using `sharedlibrary'.", &setlist), &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("auto-solib-limit", class_support, var_zinteger, (char *) &auto_solib_limit, "Set threshold (in Mb) for autoloading shared library symbols.\n\ diff --git a/gdb/source.c b/gdb/source.c index 6a91c6c6887..443421cfff4 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1647,7 +1647,7 @@ The matching line number is also stored as the value of \"$_\"."); add_com_alias ("?", "reverse-search", class_files, 0); } - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("listsize", class_support, var_uinteger, (char *) &lines_to_list, "Set number of source lines gdb will list by default.", diff --git a/gdb/symfile.c b/gdb/symfile.c index 31de4ba6017..4f499c1fd41 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -3533,7 +3533,7 @@ with the text. SECT is a section name to be loaded at SECT_ADDR.", for access from GDB.", &cmdlist); set_cmd_completer (c, filename_completer); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("symbol-reloading", class_support, var_boolean, (char *) &symbol_reloading, "Set dynamic symbol table reloading multiple times in one run.", @@ -3577,7 +3577,7 @@ Usage: set extension-language .foo bar", add_info ("extensions", info_ext_lang_command, "All filename extensions associated with a source language."); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("download-write-size", class_obscure, var_integer, (char *) &download_write_size, "Set the write size used when downloading a program.\n" @@ -3600,6 +3600,6 @@ Usage: set extension-language .foo bar", "and lastly at the path of the directory of the binary with\n" "the global debug-file directory prepended\n", &setlist)); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_completer (c, filename_completer); } diff --git a/gdb/target.c b/gdb/target.c index 75f81f3191a..70787603b2b 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2419,7 +2419,7 @@ initialize_targets (void) add_info ("target", target_info, targ_desc); add_info ("files", target_info, targ_desc); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("target", class_maintenance, var_zinteger, (char *) &targetdebug, "Set target debugging.\n\ diff --git a/gdb/top.c b/gdb/top.c index 98e50100228..e282b2edf16 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1762,7 +1762,7 @@ init_main (void) gdb. */ if (!event_loop_p) { - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("prompt", class_support, var_string, (char *) &gdb_prompt_string, "Set gdb's prompt", &setlist), @@ -1773,7 +1773,7 @@ init_main (void) c = add_set_cmd ("prompt", class_support, var_string, (char *) &new_async_prompt, "Set gdb's prompt", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_async_prompt); } @@ -1786,7 +1786,7 @@ hitting return."); as we make the event loop be the default engine of gdb. */ if (!event_loop_p) { - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("editing", class_support, var_boolean, (char *) &command_editing_p, "Set editing of command lines as they are typed.\n\ Use \"on\" to enable the editing, and \"off\" to disable it.\n\ @@ -1802,11 +1802,11 @@ Use \"on\" to enable the editing, and \"off\" to disable it.\n\ Without an argument, command line editing is enabled. To edit, use\n\ EMACS-like or VI-like commands like control-P or ESC.", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_async_editing_command); } - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("save", no_class, var_boolean, (char *) &write_history_p, "Set saving of the history record on exit.\n\ Use \"on\" to enable the saving, and \"off\" to disable it.\n\ @@ -1816,7 +1816,7 @@ Without an argument, saving is enabled.", &sethistlist), c = add_set_cmd ("size", no_class, var_integer, (char *) &history_size, "Set the size of the command history,\n\ ie. the number of previous commands to keep a record of.", &sethistlist); - add_show_from_set (c, &showhistlist); + deprecated_add_show_from_set (c, &showhistlist); set_cmd_sfunc (c, set_history_size_command); c = add_set_cmd ("filename", no_class, var_filename, @@ -1824,9 +1824,9 @@ ie. the number of previous commands to keep a record of.", &sethistlist); "Set the filename in which to record the command history\n\ (the list of previous commands of which a record is kept).", &sethistlist); set_cmd_completer (c, filename_completer); - add_show_from_set (c, &showhistlist); + deprecated_add_show_from_set (c, &showhistlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("confirm", class_support, var_boolean, (char *) &caution, "Set whether to confirm potentially dangerous operations.", @@ -1844,7 +1844,7 @@ ie. the number of previous commands to keep a record of.", &sethistlist); 0 == normal; 1 == fullname (for use when running under emacs)\n\ 2 == output annotated suitably for use by programs that control GDB.", &setlist); - c = add_show_from_set (c, &showlist); + c = deprecated_add_show_from_set (c, &showlist); } else { @@ -1853,12 +1853,12 @@ ie. the number of previous commands to keep a record of.", &sethistlist); 0 == normal; 1 == fullname (for use when running under emacs)\n\ 2 == output annotated suitably for use by programs that control GDB.", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_async_annotation_level); } if (event_loop_p) { - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("exec-done-display", class_support, var_boolean, (char *) &exec_done_display_p, "Set notification of completion for asynchronous execution commands.\n\ Use \"on\" to enable the notification, and \"off\" to disable it.", &setlist), diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 0be63b66339..a646a5a24f7 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -379,7 +379,7 @@ Usage: w <#lines>\n"); "ascii use ascii characters + - | for the border\n" "acs use the Alternate Character Set\n", &tui_setlist); - add_show_from_set (c, &tui_showlist); + deprecated_add_show_from_set (c, &tui_showlist); c = add_set_enum_cmd ("border-mode", no_class, @@ -394,7 +394,7 @@ Usage: w <#lines>\n"); "bold use extra bright or bold\n" "bold-standout use extra bright or bold with standout mode\n", &tui_setlist); - add_show_from_set (c, &tui_showlist); + deprecated_add_show_from_set (c, &tui_showlist); c = add_set_enum_cmd ("active-border-mode", no_class, @@ -409,7 +409,7 @@ Usage: w <#lines>\n"); "bold use extra bright or bold\n" "bold-standout use extra bright or bold with standout mode\n", &tui_setlist); - add_show_from_set (c, &tui_showlist); + deprecated_add_show_from_set (c, &tui_showlist); } /* Update gdb's knowledge of the terminal size. */ diff --git a/gdb/utils.c b/gdb/utils.c index 10dddeb9afc..aea58f04b01 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -2615,23 +2615,23 @@ initialize_utils (void) c = add_set_cmd ("width", class_support, var_uinteger, &chars_per_line, "Set number of characters gdb thinks are in a line.", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_width_command); c = add_set_cmd ("height", class_support, var_uinteger, &lines_per_page, "Set number of lines gdb thinks are in a page.", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_height_command); init_page_info (); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("demangle", class_support, var_boolean, (char *) &demangle, "Set demangling of encoded C++/ObjC names when displaying symbols.", &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("pagination", class_support, var_boolean, (char *) &pagination_enabled, "Set state of pagination.", &setlist), &showlist); @@ -2644,13 +2644,13 @@ initialize_utils (void) "Disable pagination"); } - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("sevenbit-strings", class_support, var_boolean, (char *) &sevenbit_strings, "Set printing of 8-bit characters in strings as \\nnn.", &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("asm-demangle", class_support, var_boolean, (char *) &asm_demangle, "Set demangling of C++/ObjC names in disassembly listings.", diff --git a/gdb/valops.c b/gdb/valops.c index de6a8ddf4c5..57e5d842dc2 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -2860,14 +2860,14 @@ void _initialize_valops (void) { #if 0 - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("abandon", class_support, var_boolean, (char *) &auto_abandon, "Set automatic abandonment of expressions upon failure.", &setlist), &showlist); #endif - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("overload-resolution", class_support, var_boolean, (char *) &overload_resolution, "Set overload resolution in evaluating C++ functions.", &setlist), diff --git a/gdb/valprint.c b/gdb/valprint.c index 294e09f58ab..16c46b8beef 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -1359,21 +1359,21 @@ _initialize_valprint (void) add_alias_cmd ("p", "print", no_class, 1, &showlist); add_alias_cmd ("pr", "print", no_class, 1, &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("elements", no_class, var_uinteger, (char *) &print_max, "Set limit on string chars or array elements to print.\n\ \"set print elements 0\" causes there to be no limit.", &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("null-stop", no_class, var_boolean, (char *) &stop_print_at_null, "Set printing of char arrays to stop at first null char.", &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("repeats", no_class, var_uinteger, (char *) &repeat_count_threshold, "Set threshold for repeated print elements.\n\ @@ -1381,27 +1381,27 @@ _initialize_valprint (void) &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("pretty", class_support, var_boolean, (char *) &prettyprint_structs, "Set prettyprinting of structures.", &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("union", class_support, var_boolean, (char *) &unionprint, "Set printing of unions interior to structures.", &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("array", class_support, var_boolean, (char *) &prettyprint_arrays, "Set prettyprinting of arrays.", &setprintlist), &showprintlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("address", class_support, var_boolean, (char *) &addressprint, "Set printing of addresses.", &setprintlist), @@ -1411,21 +1411,21 @@ _initialize_valprint (void) (char *) &input_radix, "Set default input radix for entering numbers.", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_input_radix); c = add_set_cmd ("output-radix", class_support, var_uinteger, (char *) &output_radix, "Set default output radix for printing of values.", &setlist); - add_show_from_set (c, &showlist); + deprecated_add_show_from_set (c, &showlist); set_cmd_sfunc (c, set_output_radix); - /* 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 add_set_cmd() and add_show_from_set() commands aren't really - appropriate. */ + /* 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 + add_show_from_set() commands aren't really appropriate. */ 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\ diff --git a/gdb/varobj.c b/gdb/varobj.c index ea4fa0118c1..8c1cd5729ec 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -2558,7 +2558,7 @@ _initialize_varobj (void) varobj_table = xmalloc (sizeof_table); memset (varobj_table, 0, sizeof_table); - add_show_from_set (add_set_cmd ("debugvarobj", class_maintenance, var_zinteger, (char *) &varobjdebug, "Set varobj debugging.\n\ + deprecated_add_show_from_set (add_set_cmd ("debugvarobj", class_maintenance, var_zinteger, (char *) &varobjdebug, "Set varobj debugging.\n\ When non-zero, varobj debugging is enabled.", &setlist), &showlist); } diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 376a760e939..601f28bf129 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -2125,47 +2125,54 @@ _initialize_win32_nat (void) add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1); - add_show_from_set (add_set_cmd ("shell", class_support, var_boolean, - (char *) &useshell, - "Set use of shell to start subprocess.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("new-console", class_support, var_boolean, - (char *) &new_console, - "Set creation of new console when creating child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("new-group", class_support, var_boolean, - (char *) &new_group, - "Set creation of new group when creating child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugexec", class_support, var_boolean, - (char *) &debug_exec, - "Set whether to display execution in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugevents", class_support, var_boolean, - (char *) &debug_events, - "Set whether to display kernel events in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugmemory", class_support, var_boolean, - (char *) &debug_memory, - "Set whether to display memory accesses in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugexceptions", class_support, var_boolean, - (char *) &debug_exceptions, - "Set whether to display kernel exceptions in child process.", - &setlist), - &showlist); + deprecated_add_show_from_set + (add_set_cmd ("shell", class_support, var_boolean, + (char *) &useshell, + "Set use of shell to start subprocess.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("new-console", class_support, var_boolean, + (char *) &new_console, + "Set creation of new console when creating child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("new-group", class_support, var_boolean, + (char *) &new_group, + "Set creation of new group when creating child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("debugexec", class_support, var_boolean, + (char *) &debug_exec, + "Set whether to display execution in child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("debugevents", class_support, var_boolean, + (char *) &debug_events, + "Set whether to display kernel events in child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("debugmemory", class_support, var_boolean, + (char *) &debug_memory, + "Set whether to display memory accesses in child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("debugexceptions", class_support, var_boolean, + (char *) &debug_exceptions, + "Set whether to display kernel exceptions in child process.", + &setlist), + &showlist); add_info ("dll", info_dll_command, "Status of loaded DLLs."); add_info_alias ("sharedlibrary", "dll", 1); diff --git a/gdb/wince.c b/gdb/wince.c index e8361bfe960..b70e5b9fee6 100644 --- a/gdb/wince.c +++ b/gdb/wince.c @@ -1970,7 +1970,7 @@ _initialize_wince (void) struct cmd_list_element *set; init_child_ops (); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ((char *) "remotedirectory", no_class, var_string_noescape, (char *) &remote_directory, (char *) "Set directory for remote upload.\n", @@ -1982,18 +1982,18 @@ _initialize_wince (void) var_string_noescape, (char *) &remote_upload, (char *) "Set how to upload executables to remote device.\n", &setlist); - add_show_from_set (set, &showlist); + deprecated_add_show_from_set (set, &showlist); set_cmd_cfunc (set, set_upload_type); set_upload_type (NULL, 0); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ((char *) "debugexec", class_support, var_boolean, (char *) &debug_exec, (char *) "Set whether to display execution in child process.", &setlist), &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ((char *) "remoteaddhost", class_support, var_boolean, (char *) &remote_add_host, (char *) "\ @@ -2001,21 +2001,21 @@ Set whether to add this host to remote stub arguments for\n\ debugging over a network.", &setlist), &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ((char *) "debugevents", class_support, var_boolean, (char *) &debug_events, (char *) "Set whether to display kernel events in child process.", &setlist), &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ((char *) "debugmemory", class_support, var_boolean, (char *) &debug_memory, (char *) "Set whether to display memory accesses in child process.", &setlist), &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ((char *) "debugexceptions", class_support, var_boolean, (char *) &debug_exceptions, (char *) "Set whether to display kernel exceptions in child process.", diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 376a760e939..601f28bf129 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2125,47 +2125,54 @@ _initialize_win32_nat (void) add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1); - add_show_from_set (add_set_cmd ("shell", class_support, var_boolean, - (char *) &useshell, - "Set use of shell to start subprocess.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("new-console", class_support, var_boolean, - (char *) &new_console, - "Set creation of new console when creating child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("new-group", class_support, var_boolean, - (char *) &new_group, - "Set creation of new group when creating child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugexec", class_support, var_boolean, - (char *) &debug_exec, - "Set whether to display execution in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugevents", class_support, var_boolean, - (char *) &debug_events, - "Set whether to display kernel events in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugmemory", class_support, var_boolean, - (char *) &debug_memory, - "Set whether to display memory accesses in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugexceptions", class_support, var_boolean, - (char *) &debug_exceptions, - "Set whether to display kernel exceptions in child process.", - &setlist), - &showlist); + deprecated_add_show_from_set + (add_set_cmd ("shell", class_support, var_boolean, + (char *) &useshell, + "Set use of shell to start subprocess.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("new-console", class_support, var_boolean, + (char *) &new_console, + "Set creation of new console when creating child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("new-group", class_support, var_boolean, + (char *) &new_group, + "Set creation of new group when creating child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("debugexec", class_support, var_boolean, + (char *) &debug_exec, + "Set whether to display execution in child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("debugevents", class_support, var_boolean, + (char *) &debug_events, + "Set whether to display kernel events in child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("debugmemory", class_support, var_boolean, + (char *) &debug_memory, + "Set whether to display memory accesses in child process.", + &setlist), + &showlist); + + deprecated_add_show_from_set + (add_set_cmd ("debugexceptions", class_support, var_boolean, + (char *) &debug_exceptions, + "Set whether to display kernel exceptions in child process.", + &setlist), + &showlist); add_info ("dll", info_dll_command, "Status of loaded DLLs."); add_info_alias ("sharedlibrary", "dll", 1); diff --git a/gdb/xcoffsolib.c b/gdb/xcoffsolib.c index 62426c92fb0..9dcc3c4f715 100644 --- a/gdb/xcoffsolib.c +++ b/gdb/xcoffsolib.c @@ -183,7 +183,7 @@ _initialize_xcoffsolib (void) add_info ("sharedlibrary", solib_info, "Status of loaded shared object libraries"); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("auto-solib-add", class_support, var_boolean, (char *) &auto_solib_add, "Set autoloading of shared library symbols.\n\ -- 2.30.2