From 85c078043bd43ef5cb76191a6d3e2159da0c302e Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 18 Feb 2005 18:58:56 +0000 Subject: [PATCH] 2005-02-18 Andrew Cagney Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh and gdbarch.c. * breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update. * gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update. * pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update. * serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update. * varobj.c, cli/cli-cmds.c: Update. * gdbarch.c, gdb-events.c: Regenerate. --- gdb/ChangeLog | 9 ++++ gdb/breakpoint.c | 14 +++--- gdb/cli/cli-cmds.c | 28 ++++++------ gdb/frame.c | 12 ++--- gdb/gdb-events.c | 18 ++++---- gdb/gdb-events.sh | 15 ++++--- gdb/gdbarch.c | 19 ++++---- gdb/gdbarch.sh | 23 +++++----- gdb/gdbtypes.c | 12 ++--- gdb/infrun.c | 25 ++++++----- gdb/linux-nat.c | 12 ++--- gdb/maint.c | 15 +++---- gdb/monitor.c | 13 +++--- gdb/pa64solib.c | 15 ++++--- gdb/parse.c | 15 ++++--- gdb/remote-mips.c | 61 +++++++++++++------------ gdb/ser-go32.c | 110 ++++++++++++++++++++++----------------------- gdb/serial.c | 16 +++---- gdb/solib-frv.c | 15 ++++--- gdb/somsolib.c | 15 ++++--- gdb/target.c | 13 +++--- gdb/top.c | 13 +++--- gdb/varobj.c | 11 +++-- 23 files changed, 269 insertions(+), 230 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c5a5fb67a2c..12063e8b763 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2005-02-18 Andrew Cagney + Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh + and gdbarch.c. + * breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update. + * gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update. + * pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update. + * serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update. + * varobj.c, cli/cli-cmds.c: Update. + * gdbarch.c, gdb-events.c: Regenerate. + Use add_setshow_boolean_command through out. Delete #ifdef 0'ed code adding set/show boolean commands. * cp-valprint.c, dcache.c, exec.c, gdbtypes.c, infrun.c: Update. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index ecc22ffb063..fab6eb1b8a4 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -7928,15 +7928,17 @@ an expression is either read or written.")); _("Synonym for ``info breakpoints''.")); - c = add_set_cmd ("can-use-hw-watchpoints", class_support, var_zinteger, - (char *) &can_use_hw_watchpoints, - "Set debugger's willingness to use watchpoint hardware.\n\ + add_setshow_zinteger_cmd ("can-use-hw-watchpoints", class_support, + &can_use_hw_watchpoints, _("\ +Set debugger's willingness to use watchpoint hardware."), _("\ +Show debugger's willingness to use watchpoint hardware."), _("\ If zero, gdb will not use hardware for new watchpoints, even if\n\ such is available. (However, any hardware watchpoints that were\n\ created before setting this to nonzero, will continue to use watchpoint\n\ -hardware.)", - &setlist); - deprecated_add_show_from_set (c, &showlist); +hardware.)"), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); can_use_hw_watchpoints = 1; diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index dcbb5f99071..4f265b87ad6 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1181,21 +1181,23 @@ 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). */ - 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\ + add_setshow_zinteger_cmd ("remotebaud", no_class, &baud_rate, _("\ +Set baud rate for remote serial I/O."), _("\ +Show baud rate for remote serial I/O."), _("\ This value is used to set the speed of the serial port when debugging\n\ -using remote targets.", &setlist), - &showlist); - - deprecated_add_show_from_set - (add_set_cmd ("remote", no_class, var_zinteger, - (char *) &remote_debug, - "Set debugging of remote protocol.\n\ +using remote targets."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("remote", no_class, &remote_debug, _("\ +Set debugging of remote protocol."), _("\ +Show debugging of remote protocol."), _("\ When enabled, each packet sent or received with the remote target\n\ -is displayed.", &setdebuglist), - &showdebuglist); +is displayed."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); deprecated_add_show_from_set (add_set_cmd ("remotetimeout", no_class, var_integer, (char *) &remote_timeout, diff --git a/gdb/frame.c b/gdb/frame.c index 34adf3de3a3..3d258b9ed33 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1587,9 +1587,11 @@ Zero is unlimited."), &show_backtrace_cmdlist); /* Debug this files internals. */ - 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); + add_setshow_zinteger_cmd ("frame", class_maintenance, &frame_debug, _("\ +Set frame debugging."), _("\ +Show frame debugging."), _("\ +When non-zero, frame specific internal debugging is enabled."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/gdb-events.c b/gdb/gdb-events.c index 5bd5255adbd..a321122fa75 100644 --- a/gdb/gdb-events.c +++ b/gdb/gdb-events.c @@ -1,6 +1,7 @@ /* User Interface Events. - Copyright 1999, 2001, 2002, 2004 Free Software Foundation, Inc. + Copyright 1999, 2001, 2002, 2004, 2005 Free Software Foundation, + Inc. Contributed by Cygnus Solutions. @@ -331,11 +332,12 @@ _initialize_gdb_events (void) queue_event_hooks.tracepoint_modify = queue_tracepoint_modify; queue_event_hooks.architecture_changed = queue_architecture_changed; - 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); + add_setshow_zinteger_cmd ("event", class_maintenance, + &gdb_events_debug, _("\ +Set event debugging."), _("\ +Show event debugging."), _("\ +When non-zero, event/notify debugging is enabled."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/gdb-events.sh b/gdb/gdb-events.sh index 84a6e4c509c..de7a437a0d6 100755 --- a/gdb/gdb-events.sh +++ b/gdb/gdb-events.sh @@ -474,13 +474,14 @@ do done cat <bfd_architecture) internal_error (__FILE__, __LINE__, - "gdbarch: Duplicate registraration of architecture (%s)", + _("gdbarch: Duplicate registraration of architecture (%s)"), bfd_arch_info->printable_name); } /* log it */ @@ -4199,12 +4199,11 @@ _initialize_gdbarch (void) { struct cmd_list_element *c; - deprecated_add_show_from_set - (add_set_cmd ("arch", - class_maintenance, - var_zinteger, - (char *)&gdbarch_debug, - "Set architecture debugging.\n\ -When non-zero, architecture debugging is enabled.", &setdebuglist), - &showdebuglist); + add_setshow_zinteger_cmd ("arch", class_maintenance, &gdbarch_debug, _("\ +Set architecture debugging."), _("\ +Show architecture debugging."), _("\ +When non-zero, architecture debugging is enabled."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 89fc5b86313..4b7e6924939 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1462,7 +1462,7 @@ cat < 0) internal_error (__FILE__, __LINE__, - "verify_gdbarch: the following are invalid ...%s", + _("verify_gdbarch: the following are invalid ...%s"), buf); do_cleanups (cleanups); } @@ -1957,7 +1957,7 @@ gdbarch_printable_names (void) ap = bfd_lookup_arch (rego->bfd_architecture, 0); if (ap == NULL) internal_error (__FILE__, __LINE__, - "gdbarch_architecture_names: multi-arch unknown"); + _("gdbarch_architecture_names: multi-arch unknown")); do { append_name (&arches, &nr_arches, ap->printable_name); @@ -1982,7 +1982,7 @@ gdbarch_register (enum bfd_architecture bfd_architecture, if (bfd_arch_info == NULL) { internal_error (__FILE__, __LINE__, - "gdbarch: Attempt to register unknown architecture (%d)", + _("gdbarch: Attempt to register unknown architecture (%d)"), bfd_architecture); } /* Check that we haven't seen this architecture before */ @@ -1992,7 +1992,7 @@ gdbarch_register (enum bfd_architecture bfd_architecture, { if (bfd_architecture == (*curr)->bfd_architecture) internal_error (__FILE__, __LINE__, - "gdbarch: Duplicate registraration of architecture (%s)", + _("gdbarch: Duplicate registraration of architecture (%s)"), bfd_arch_info->printable_name); } /* log it */ @@ -2216,14 +2216,13 @@ _initialize_gdbarch (void) { struct cmd_list_element *c; - deprecated_add_show_from_set - (add_set_cmd ("arch", - class_maintenance, - var_zinteger, - (char *)&gdbarch_debug, - "Set architecture debugging.\\n\\ -When non-zero, architecture debugging is enabled.", &setdebuglist), - &showdebuglist); + add_setshow_zinteger_cmd ("arch", class_maintenance, &gdbarch_debug, _("\\ +Set architecture debugging."), _("\\ +Show architecture debugging."), _("\\ +When non-zero, architecture debugging is enabled."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } EOF diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index bb9fe3fc6cb..42f55444a5d 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -3707,9 +3707,11 @@ _initialize_gdbtypes (void) "builtin_type_ia64_quad_little", &floatformat_ia64_quad_little); - deprecated_add_show_from_set - (add_set_cmd ("overload", no_class, var_zinteger, (char *) &overload_debug, - "Set debugging of C++ overloading.\n\ -When enabled, ranking of the functions is displayed.", &setdebuglist), - &showdebuglist); + add_setshow_zinteger_cmd ("overload", no_class, &overload_debug, _("\ +Set debugging of C++ overloading."), _("\ +Show debugging of C++ overloading."), _("\ +When enabled, ranking of the functions is displayed."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/infrun.c b/gdb/infrun.c index 8cd95a125b2..eb5fa1502ab 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3840,9 +3840,13 @@ There is no `stop' command, but you can set a hook on `stop'.\n\ This allows you to set a list of commands to be run each time execution\n\ of the program stops."), &cmdlist); - add_set_cmd ("infrun", class_maintenance, var_zinteger, - &debug_infrun, "Set inferior debugging.\n\ -When non-zero, inferior specific debugging is enabled.", &setdebuglist); + add_setshow_zinteger_cmd ("infrun", class_maintenance, &debug_infrun, _("\ +Set inferior debugging."), _("\ +Show inferior debugging."), _("\ +When non-zero, inferior specific debugging is enabled."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); numsigs = (int) TARGET_SIGNAL_LAST; signal_stop = (unsigned char *) xmalloc (sizeof (signal_stop[0]) * numsigs); @@ -3892,15 +3896,16 @@ When non-zero, inferior specific debugging is enabled.", &setdebuglist); signal_print[TARGET_SIGNAL_CANCEL] = 0; #ifdef SOLIB_ADD - deprecated_add_show_from_set - (add_set_cmd ("stop-on-solib-events", class_support, var_zinteger, - (char *) &stop_on_solib_events, - "Set stopping for shared library events.\n\ + add_setshow_zinteger_cmd ("stop-on-solib-events", class_support, + &stop_on_solib_events, _("\ +Set stopping for shared library events."), _("\ +Show stopping for shared library events."), _("\ If nonzero, gdb will give control to the user when the dynamic linker\n\ notifies gdb of shared library events. The most common event of interest\n\ -to the user would be loading/unloading of a new library.\n", - &setlist), - &showlist); +to the user would be loading/unloading of a new library."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); #endif c = add_set_enum_cmd ("follow-fork-mode", diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index a2920bdf1a6..80b0cfff70c 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -3084,11 +3084,13 @@ Specify any of the following keywords for detailed info:\n\ sigemptyset (&blocked_mask); - deprecated_add_show_from_set - (add_set_cmd ("lin-lwp", no_class, var_zinteger, - (char *) &debug_linux_nat, - "Set debugging of GNU/Linux lwp module.\n\ -Enables printf debugging output.\n", &setdebuglist), &showdebuglist); + add_setshow_zinteger_cmd ("lin-lwp", no_class, &debug_linux_nat, _("\ +Set debugging of GNU/Linux lwp module."), _("\ +Show debugging of GNU/Linux lwp module."), _("\ +Enables printf debugging output."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/maint.c b/gdb/maint.c index afbcba30faf..b1553811a8d 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -852,16 +852,15 @@ testsuite can check the comamnd deprecator. You probably shouldn't use this,\n\ If you decide you want to use it: maintenance undeprecate 'commandname'"), &maintenancelist); - deprecated_add_show_from_set - (add_set_cmd ("watchdog", class_maintenance, var_zinteger, - (char *) &watchdog, - "Set watchdog timer.\n\ + add_setshow_zinteger_cmd ("watchdog", class_maintenance, &watchdog, _("\ +Set watchdog timer."), _("\ +Show watchdog timer."), _("\ When non-zero, this timeout is used instead of waiting forever for a target\n\ to finish a low-level step or continue operation. If the specified amount\n\ -of time passes without a response from the target, an error occurs.", - &setlist), - &showlist); - +of time passes without a response from the target, an error occurs."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); add_setshow_boolean_cmd ("profile", class_maintenance, &maintenance_profile_p, _("\ diff --git a/gdb/monitor.c b/gdb/monitor.c index 76a7d702b79..c805eb47834 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -2303,11 +2303,12 @@ When enabled, a hashmark \'#\' is displayed."), NULL, /* FIXME: i18n: */ &setlist, &showlist); - deprecated_add_show_from_set - (add_set_cmd ("monitor", no_class, var_zinteger, - (char *) &monitor_debug_p, - "Set debugging of remote monitor communication.\n\ + add_setshow_zinteger_cmd ("monitor", no_class, &monitor_debug_p, _("\ +Set debugging of remote monitor communication."), _("\ +Show debugging of remote monitor communication."), _("\ When enabled, communication between GDB and the remote monitor\n\ -is displayed.", &setdebuglist), - &showdebuglist); +is displayed."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/pa64solib.c b/gdb/pa64solib.c index daa8815d958..f0589e7cdfe 100644 --- a/gdb/pa64solib.c +++ b/gdb/pa64solib.c @@ -901,15 +901,16 @@ inferior. Otherwise, symbols must be loaded manually, using `sharedlibrary'."), NULL, /* FIXME: i18n: */ &setlist, &showlist); - 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\ + add_setshow_zinteger_cmd ("auto-solib-limit", class_support, + &auto_solib_limit, _("\ +Set threshold (in Mb) for autoloading shared library symbols."), _("\ +Show threshold (in Mb) for autoloading shared library symbols."), _("\ When shared library autoloading is enabled, new libraries will be loaded\n\ only until the total size of shared library symbols exceeds this\n\ -threshold in megabytes. Is ignored when using `sharedlibrary'.", - &setlist), - &showlist); +threshold in megabytes. Is ignored when using `sharedlibrary'."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); /* ??rehrauer: On HP-UX, the kernel parameter MAXDSIZ limits how much data space a process can use. We ought to be reading diff --git a/gdb/parse.c b/gdb/parse.c index da80b99c339..4720f016e47 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -1312,11 +1312,12 @@ _initialize_parse (void) DEPRECATED_REGISTER_GDBARCH_SWAP (msym_unknown_symbol_type); deprecated_register_gdbarch_swap (NULL, 0, build_parse); - deprecated_add_show_from_set - (add_set_cmd ("expression", class_maintenance, var_zinteger, - (char *) &expressiondebug, - "Set expression debugging.\n\ -When non-zero, the internal representation of expressions will be printed.", - &setdebuglist), - &showdebuglist); + add_setshow_zinteger_cmd ("expression", class_maintenance, + &expressiondebug, _("\ +Set expression debugging."), _("\ +Show expression debugging."), _("\ +When non-zero, the internal representation of expressions will be printed."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index 9b0e9575850..f26344da1df 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -3370,31 +3370,34 @@ of the TFTP temporary file, if it differs from the filename seen by the board."; add_target (&ddb_ops); add_target (&lsi_ops); - 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\ + add_setshow_zinteger_cmd ("timeout", no_class, &mips_receive_wait, _("\ +Set timeout in seconds for remote MIPS serial I/O."), _("\ +Show timeout in seconds for remote MIPS serial I/O."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("retransmit-timeout", no_class, + &mips_retransmit_wait, _("\ +Set retransmit timeout in seconds for remote MIPS serial I/O."), _("\ +Show retransmit timeout in seconds for remote MIPS serial I/O."), _("\ This is the number of seconds to wait for an acknowledgement to a packet\n\ -before resending the packet.", &setlist), - &showlist); - - 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\ +before resending the packet."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("syn-garbage-limit", no_class, + &mips_syn_garbage, _("\ +Set the maximum number of characters to ignore when scanning for a SYN."), _("\ +Show the maximum number of characters to ignore when scanning for a SYN."), _("\ 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\n\ limit. (Note that these characters are printed out even though they are\n\ -ignored.)", - &setlist), - &showlist); +ignored.)"), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); deprecated_add_show_from_set (add_set_cmd ("monitor-prompt", class_obscure, var_string, @@ -3403,14 +3406,14 @@ ignored.)", &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_setshow_zinteger_cmd ("monitor-warnings", class_obscure, + &monitor_warnings, _("\ +Set printing of monitor warnings."), _("\ +Show printing of monitor warnings."), _("\ +When enabled, monitor warnings about hardware breakpoints will be displayed."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); add_com ("pmon ", class_obscure, pmon_command, _("Send a packet to PMON (must be in debug mode).")); diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c index a72629f5710..865bc6b785f 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 */ - 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_setshow_zinteger_cmd ("com1base", class_obscure, &ports[0].base, _("\ +Set COM1 base i/o port address."), _("\ +Show COM1 base i/o port address."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("com1irq", class_obscure, &ports[0].irq, _("\ +Set COM1 interrupt request."), _("\ +Show COM1 interrupt request."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("com2base", class_obscure, &ports[1].base, _("\ +Set COM2 base i/o port address."), _("\ +Show COM2 base i/o port address."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("com2irq", class_obscure, &ports[1].irq, _("\ +Set COM2 interrupt request."), _("\ +Show COM2 interrupt request."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("com3base", class_obscure, &ports[2].base, _("\ +Set COM3 base i/o port address."), _("\ +Show COM3 base i/o port address."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("com3irq", class_obscure, &ports[2].irq, _("\ +Set COM3 interrupt request."), _("\ +Show COM3 interrupt request."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("com4base", class_obscure, &ports[3].base, _("\ +Set COM4 base i/o port address."), _("\ +Show COM4 base i/o port address."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_zinteger_cmd ("com4irq", class_obscure, &ports[3].irq, _("\ +Set COM4 interrupt request."), _("\ +Show COM4 interrupt request."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); add_info ("serial", dos_info, _("Print DOS serial port status.")); diff --git a/gdb/serial.c b/gdb/serial.c index a2562d3289d..cb8d88d5be8 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -702,12 +702,12 @@ by gdbserver."), &setlist), &showlist); - 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); + add_setshow_zinteger_cmd ("serial", class_maintenance, + &global_serial_debug_p, _("\ +Set serial debugging."), _("\ +Show serial debugging."), _("\ +When non-zero, serial port debugging is enabled."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c index 6b2995cf331..3fb542445fb 100644 --- a/gdb/solib-frv.c +++ b/gdb/solib-frv.c @@ -1218,11 +1218,12 @@ _initialize_frv_solib (void) current_target_so_ops = &frv_so_ops; /* Debug this file's internals. */ - 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); + add_setshow_zinteger_cmd ("solib-frv", class_maintenance, + &solib_frv_debug, _("\ +Set internal debugging of shared library code for FR-V."), _("\ +Show internal debugging of shared library code for FR-V."), _("\ +When non-zero, FR-V solib specific internal debugging is enabled."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); } diff --git a/gdb/somsolib.c b/gdb/somsolib.c index 166180c4765..291ecadb8f3 100644 --- a/gdb/somsolib.c +++ b/gdb/somsolib.c @@ -1569,15 +1569,16 @@ inferior. Otherwise, symbols must be loaded manually, using `sharedlibrary'."), NULL, /* FIXME: i18n: */ &setlist, &showlist); - 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\ + add_setshow_zinteger_cmd ("auto-solib-limit", class_support, + &auto_solib_limit, _("\ +Set threshold (in Mb) for autoloading shared library symbols."), _("\ +Show threshold (in Mb) for autoloading shared library symbols."), _("\ When shared library autoloading is enabled, new libraries will be loaded\n\ only until the total size of shared library symbols exceeds this\n\ -threshold in megabytes. Is ignored when using `sharedlibrary'.", - &setlist), - &showlist); +threshold in megabytes. Is ignored when using `sharedlibrary'."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); /* ??rehrauer: On HP-UX, the kernel parameter MAXDSIZ limits how much data space a process can use. We ought to be reading diff --git a/gdb/target.c b/gdb/target.c index 563008051bc..5270f00e230 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2552,14 +2552,15 @@ initialize_targets (void) add_info ("target", target_info, targ_desc); add_info ("files", target_info, targ_desc); - deprecated_add_show_from_set - (add_set_cmd ("target", class_maintenance, var_zinteger, - (char *) &targetdebug, - "Set target debugging.\n\ + add_setshow_zinteger_cmd ("target", class_maintenance, &targetdebug, _("\ +Set target debugging."), _("\ +Show target debugging."), _("\ When non-zero, target debugging is enabled. Higher numbers are more\n\ verbose. Changes do not take effect until the next \"run\" or \"target\"\n\ -command.", &setdebuglist), - &showdebuglist); +command."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); add_setshow_boolean_cmd ("trust-readonly-sections", class_support, &trust_readonly, _("\ diff --git a/gdb/top.c b/gdb/top.c index 13250a19b47..4ef6b550c82 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1425,13 +1425,14 @@ Show whether to confirm potentially dangerous operations."), NULL, NULL, /* FIXME: i18n: */ &setlist, &showlist); - c = add_set_cmd ("annotate", class_obscure, var_zinteger, - (char *) &annotation_level, "Set annotation_level.\n\ + add_setshow_zinteger_cmd ("annotate", class_obscure, &annotation_level, _("\ +Set annotation_level."), _("\ +Show annotation_level."), _("\ 0 == normal; 1 == fullname (for use when running under emacs)\n\ -2 == output annotated suitably for use by programs that control GDB.", - &setlist); - deprecated_add_show_from_set (c, &showlist); - set_cmd_sfunc (c, set_async_annotation_level); +2 == output annotated suitably for use by programs that control GDB."), + set_async_annotation_level, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); add_setshow_boolean_cmd ("exec-done-display", class_support, &exec_done_display_p, _("\ diff --git a/gdb/varobj.c b/gdb/varobj.c index 4b931616dcf..824c3e577e7 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -2559,7 +2559,12 @@ _initialize_varobj (void) varobj_table = xmalloc (sizeof_table); memset (varobj_table, 0, sizeof_table); - 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); + add_setshow_zinteger_cmd ("debugvarobj", class_maintenance, + &varobjdebug, _("\ +Set varobj debugging."), _("\ +Show varobj debugging."), _("\ +When non-zero, varobj debugging is enabled."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); } -- 2.30.2