From 7c2bac7214a0b5eebde3a9d7e757a58394c5627d Mon Sep 17 00:00:00 2001 From: cagney Date: Thu, 17 Feb 2005 17:11:03 +0000 Subject: [PATCH] 2005-02-17 Andrew Cagney * cli/cli-decode.c (add_setshow_filename_cmd): Set the completer to filename_completer. * solib.c (_initialize_solib, reload_shared_libraries): Use add_setshow_filename_cmd. * serial.c (_initialize_serial): Ditto. * remote-utils.c (_initialize_sr_support): Ditto. --- gdb/cli/cli-decode.c | 6 ++++-- gdb/proc-api.c | 12 ++++++------ gdb/remote-utils.c | 16 ++++++++-------- gdb/serial.c | 14 +++++++------- gdb/solib.c | 21 +++++++++++---------- 5 files changed, 36 insertions(+), 33 deletions(-) diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 529b475220..f9e2925e9c 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -23,7 +23,7 @@ #include #include "gdb_regex.h" #include "gdb_string.h" - +#include "completer.h" #include "ui-out.h" #include "cli/cli-cmds.h" @@ -488,11 +488,13 @@ add_setshow_filename_cmd (char *name, enum command_class class, struct cmd_list_element **set_list, struct cmd_list_element **show_list) { + struct cmd_list_element *set_result; add_setshow_cmd_full (name, class, var_filename, var, set_doc, show_doc, help_doc, set_func, show_func, set_list, show_list, - NULL, NULL); + &set_result, NULL); + set_cmd_completer (set_result, filename_completer); } /* Add element named NAME to both the set and show command LISTs (the diff --git a/gdb/proc-api.c b/gdb/proc-api.c index ec8060ce2b..bef297cdbe 100644 --- a/gdb/proc-api.c +++ b/gdb/proc-api.c @@ -788,10 +788,10 @@ _initialize_proc_api (void) set_cmd_sfunc (c, set_procfs_trace_cmd); set_cmd_completer (c, filename_completer); - c = add_set_cmd ("procfs-file", no_class, var_filename, - (char *) &procfs_filename, - "Set filename for /proc tracefile.\n", &setlist); - - deprecated_add_show_from_set (c, &showlist); - set_cmd_sfunc (c, set_procfs_file_cmd); + add_setshow_filename_cmd ("procfs-file", no_class, &procfs_filename, _("\ +Set filename for /proc tracefile."), _("\ +Show filename for /proc tracefile."), NULL, + set_procfs_file_cmd, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); } diff --git a/gdb/remote-utils.c b/gdb/remote-utils.c index ebac95a95d..65e4f498f0 100644 --- a/gdb/remote-utils.c +++ b/gdb/remote-utils.c @@ -595,14 +595,14 @@ gr_prepare_to_store (void) void _initialize_sr_support (void) { -/* FIXME-now: if target is open... */ - 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); + /* FIXME-now: if target is open... */ + add_setshow_filename_cmd ("remotedevice", no_class, &sr_settings.device, _("\ +Set device for remote serial I/O."), _("\ +Show device for remote serial I/O."), _("\ +This device is used as the serial port when debugging using remote targets."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); add_com ("remote ", class_obscure, sr_com, _("Send a command to the remote monitor.")); diff --git a/gdb/serial.c b/gdb/serial.c index 0c58806aa0..a2562d3289 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -686,14 +686,14 @@ Show default serial/parallel port configuration."), 0/*allow-unknown*/, &showlist); - deprecated_add_show_from_set - (add_set_cmd ("remotelogfile", no_class, - var_filename, (char *) &serial_logfile, - "Set filename for remote session recording.\n\ + add_setshow_filename_cmd ("remotelogfile", no_class, &serial_logfile, _("\ +Set filename for remote session recording."), _("\ +Show filename for remote session recording."), _("\ This file is used to record the remote session for future playback\n\ -by gdbserver.", - &setlist), - &showlist); +by gdbserver."), + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); deprecated_add_show_from_set (add_set_enum_cmd ("remotelogbase", no_class, diff --git a/gdb/solib.c b/gdb/solib.c index c9f088888c..82c009f23f 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -879,7 +879,8 @@ no_shared_libraries (char *ignored, int from_tty) } static void -reload_shared_libraries (char *ignored, int from_tty) +reload_shared_libraries (char *ignored, int from_tty, + struct cmd_list_element *e) { no_shared_libraries (NULL, from_tty); solib_add (NULL, from_tty, NULL, auto_solib_add); @@ -910,14 +911,14 @@ inferior. Otherwise, symbols must be loaded manually, using `sharedlibrary'.", &setlist), &showlist); - c = add_set_cmd ("solib-absolute-prefix", class_support, var_filename, - (char *) &solib_absolute_prefix, - "Set prefix for loading absolute shared library symbol files.\n\ -For other (relative) files, you can add values using `set solib-search-path'.", - &setlist); - deprecated_add_show_from_set (c, &showlist); - set_cmd_cfunc (c, reload_shared_libraries); - set_cmd_completer (c, filename_completer); + add_setshow_filename_cmd ("solib-absolute-prefix", class_support, + &solib_absolute_prefix, _("\ +Set prefix for loading absolute shared library symbol files."), _("\ +Show prefix for loading absolute shared library symbol files."), _("\ +For other (relative) files, you can add values using `set solib-search-path'."), + reload_shared_libraries, + NULL, + &setlist, &showlist); /* Set the default value of "solib-absolute-prefix" from the sysroot, if one is set. */ @@ -929,6 +930,6 @@ For other (relative) files, you can add values using `set solib-search-path'.", This takes precedence over the environment variables PATH and LD_LIBRARY_PATH.", &setlist); deprecated_add_show_from_set (c, &showlist); - set_cmd_cfunc (c, reload_shared_libraries); + set_cmd_sfunc (c, reload_shared_libraries); set_cmd_completer (c, filename_completer); } -- 2.11.0