diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 16aa4edec03..8a3eba880b7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2005-02-17 Andrew Cagney + * cli/cli-decode.c (add_setshow_string_noescape_cmd): New function. + * command.h (add_setshow_string_noescape_cmd): Declare. + * wince.c (_initialize_wince): Use. + * symfile.c (_initialize_symfile): Use. + (set_ext_lang_command): Update declaration. + * corefile.c (_initialize_core): Use. + * cli/cli-decode.c (add_setshow_cmd_full, add_setshow_enum_cmd) (add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd) (add_setshow_filename_cmd, add_setshow_string_cmd) diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 5d1583d9b6e..529b475220d 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -514,6 +514,25 @@ add_setshow_string_cmd (char *name, enum command_class class, NULL, NULL); } +/* Add element named NAME to both the set and show command LISTs (the + list for set/show or some sublist thereof). */ +void +add_setshow_string_noescape_cmd (char *name, enum command_class class, + char **var, + const char *set_doc, const char *show_doc, + const char *help_doc, + cmd_sfunc_ftype *set_func, + show_value_ftype *show_func, + struct cmd_list_element **set_list, + struct cmd_list_element **show_list) +{ + add_setshow_cmd_full (name, class, var_string_noescape, var, + set_doc, show_doc, help_doc, + set_func, show_func, + set_list, show_list, + NULL, NULL); +} + /* Add element named NAME to both the set and show command LISTs (the list for set/show or some sublist thereof). CLASS is as in add_cmd. VAR is address of the variable which will contain the diff --git a/gdb/command.h b/gdb/command.h index b0e17a7a09b..01eb0de9eb9 100644 --- a/gdb/command.h +++ b/gdb/command.h @@ -290,6 +290,17 @@ extern void add_setshow_string_cmd (char *name, struct cmd_list_element **set_list, struct cmd_list_element **show_list); +extern void add_setshow_string_noescape_cmd (char *name, + enum command_class class, + char **var, + const char *set_doc, + const char *show_doc, + const char *help_doc, + cmd_sfunc_ftype *set_func, + show_value_ftype *show_func, + struct cmd_list_element **set_list, + struct cmd_list_element **show_list); + extern void add_setshow_uinteger_cmd (char *name, enum command_class class, unsigned int *var, diff --git a/gdb/corefile.c b/gdb/corefile.c index 2f4fccc5eac..570f34075d8 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -448,13 +448,15 @@ No arg means have no core file. This command has been superseded by the\n\ `target core' and `detach' commands."), &cmdlist); set_cmd_completer (c, filename_completer); - c = add_set_cmd ("gnutarget", class_files, var_string_noescape, - (char *) &gnutarget_string, - "Set the current BFD target.\n\ -Use `set gnutarget auto' to specify automatic detection.", - &setlist); - set_cmd_sfunc (c, set_gnutarget_command); - deprecated_add_show_from_set (c, &showlist); + + add_setshow_string_noescape_cmd ("gnutarget", class_files, + &gnutarget_string, _("(\ +Set the current BFD target."), _("\ +Show the current BFD target."), _("\ +Use `set gnutarget auto' to specify automatic detection."), + set_gnutarget_command, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); if (getenv ("GNUTARGET")) set_gnutarget (getenv ("GNUTARGET")); diff --git a/gdb/symfile.c b/gdb/symfile.c index 291af7f25e8..201a7f4072a 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -138,8 +138,6 @@ static int simple_overlay_update_1 (struct obj_section *); static void add_filename_language (char *ext, enum language lang); -static void set_ext_lang_command (char *args, int from_tty); - static void info_ext_lang_command (char *args, int from_tty); static char *find_separate_debug_file (struct objfile *objfile); @@ -2090,7 +2088,7 @@ add_filename_language (char *ext, enum language lang) static char *ext_args; static void -set_ext_lang_command (char *args, int from_tty) +set_ext_lang_command (char *args, int from_tty, struct cmd_list_element *e) { int i; char *cp = ext_args; @@ -3596,12 +3594,14 @@ for access from GDB."), &cmdlist); /* Filename extension to source language lookup table: */ init_filename_language_table (); - c = add_set_cmd ("extension-language", class_files, var_string_noescape, - (char *) &ext_args, - "Set mapping between filename extension and source language.\n\ -Usage: set extension-language .foo bar", - &setlist); - set_cmd_cfunc (c, set_ext_lang_command); + add_setshow_string_noescape_cmd ("extension-language", class_files, + &ext_args, _("\ +Set mapping between filename extension and source language."), _("\ +Show mapping between filename extension and source language."), _("\ +Usage: set extension-language .foo bar"), + set_ext_lang_command, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); add_info ("extensions", info_ext_lang_command, _("All filename extensions associated with a source language.")); diff --git a/gdb/wince.c b/gdb/wince.c index 8c9be07ab04..3e460358be5 100644 --- a/gdb/wince.c +++ b/gdb/wince.c @@ -2020,22 +2020,22 @@ _initialize_wince (void) struct cmd_list_element *set; init_child_ops (); - 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", - &setlist), - &showlist); + add_setshow_string_noescape_cmd ("remotedirectory", no_class, + &remote_directory, _("\ +Set directory for remote upload."), _("\ +Show directory for remote upload."), NULL, + NULL, /* FIXME: i18n: */ + NULL, NULL, + &setlist, &showlist); remote_directory = xstrdup (remote_directory); - set = add_set_cmd ((char *) "remoteupload", no_class, - var_string_noescape, (char *) &remote_upload, - (char *) "\ -Set how to upload executables to remote device.\n", - &setlist); - - deprecated_add_show_from_set (set, &showlist); - set_cmd_cfunc (set, set_upload_type); + add_setshow_string_noescape_cmd ("remoteupload", no_class, + &remote_upload, _("\ +Set how to upload executables to remote device."), _("\ +Show how to upload executables to remote device."), NULL, + NULL, /* FIXME: i18n: */ + set_upload_type, NULL, + &setlist, &showlist); set_upload_type (NULL, 0); deprecated_add_show_from_set