aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/ChangeLog11
-rw-r--r--gdb/arm-tdep.c3
-rw-r--r--gdb/cli/cli-decode.c50
-rw-r--r--gdb/cli/cli-decode.h10
-rw-r--r--gdb/cli/cli-dump.c2
-rw-r--r--gdb/command.h19
-rw-r--r--gdb/infrun.c20
-rw-r--r--gdb/kod.c13
8 files changed, 19 insertions, 109 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3ced130..11d22c3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
2005-02-21 Andrew Cagney <cagney@gnu.org>
+ * cli/cli-decode.c (add_set_enum_cmd): Delete function.
+ (deprecated_add_show_from_set): Delete function.
+ * command.h (add_set_enum_cmd): Delete declaration.
+ (deprecated_add_show_from_set): Delete declaration.
+ * cli/cli-decode.h (add_set_enum_cmd): Delete declaration.
+ (deprecated_add_show_from_set): Delete declaration.
+ * arm-tdep.c (_initialize_arm_tdep): Update comment.
+ * kod.c (kod_set_os): Simplify.
+ * infrun.c (set_schedlock_func): Simplify.
+ * cli/cli-dump.c (add_dump_command): Update comment.
+
Replace string variables with a filename completer with
add_setshow_optional_filename_cmd.
* solib.c, symfile.c: Update.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 5d72bf3..6afe0d5 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2848,7 +2848,8 @@ _initialize_arm_tdep (void)
/* Sync the opcode insn printer with our register viewer. */
parse_arm_disassembler_option ("reg-names-std");
- /* Initialize the array that will be passed to add_set_enum_cmd(). */
+ /* Initialize the array that will be passed to
+ add_setshow_enum_cmd(). */
valid_disassembly_styles
= xmalloc ((num_disassembly_options + 1) * sizeof (char *));
for (i = 0; i < num_disassembly_options; i++)
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index f2a533c..33a045a 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -378,29 +378,6 @@ add_set_cmd (char *name,
return add_set_or_show_cmd (name, set_cmd, class, var_type, var, doc, list);
}
-/* Add element named NAME to command list LIST (the list for set
- or some sublist thereof).
- CLASS is as in add_cmd.
- ENUMLIST is a list of strings which may follow NAME.
- VAR is address of the variable which will contain the matching string
- (from ENUMLIST).
- DOC is the documentation string. */
-
-struct cmd_list_element *
-add_set_enum_cmd (char *name,
- enum command_class class,
- const char *enumlist[],
- const char **var,
- char *doc,
- struct cmd_list_element **list)
-{
- struct cmd_list_element *c
- = add_set_cmd (name, class, var_enum, var, doc, list);
- c->enums = enumlist;
-
- return c;
-}
-
/* Add element named NAME to command list LIST (the list for set or
some sublist thereof). CLASS is as in add_cmd. ENUMLIST is a list
of strings which may follow NAME. VAR is address of the variable
@@ -617,33 +594,6 @@ add_setshow_zinteger_cmd (char *name, enum command_class class,
NULL, NULL);
}
-/* 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
- 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 *
-deprecated_add_show_from_set (struct cmd_list_element *setcmd,
- struct cmd_list_element **list)
-{
- char *doc;
- const static char setstring[] = "Set ";
-
- /* Create a doc string by replacing "Set " at the start of the
- `set'' command's doco with "Show ". */
- gdb_assert (strncmp (setcmd->doc, setstring, sizeof (setstring) - 1) == 0);
- doc = concat ("Show ", setcmd->doc + sizeof (setstring) - 1, NULL);
-
- /* Insert the basic command. */
- return add_set_or_show_cmd (setcmd->name, show_cmd, setcmd->class,
- setcmd->var_type, setcmd->var, doc, list);
-}
-
/* Remove the command named NAME from the command list. */
void
diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 9ffe2c5..261f8c7 100644
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -292,16 +292,6 @@ extern struct cmd_list_element *add_set_cmd (char *name, enum
char *doc,
struct cmd_list_element **list);
-extern struct cmd_list_element *add_set_enum_cmd (char *name,
- enum command_class class,
- const char *enumlist[],
- const char **var,
- char *doc,
- struct cmd_list_element **list);
-
-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. */
extern void help_cmd (char *, struct ui_file *);
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index e2323d6..295e2eb 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -429,7 +429,7 @@ add_dump_command (char *name, void (*func) (char *args, char *mode),
c->func = call_dump_func;
/* Replace "Dump " at start of docstring with "Append " (borrowed
- from deprecated_add_show_from_set). */
+ from [deleted] 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 cace34f..7e19f43 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -156,15 +156,6 @@ 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 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);
@@ -220,13 +211,6 @@ extern struct cmd_list_element *add_set_cmd (char *name, enum
char *doc,
struct cmd_list_element **list);
-extern struct cmd_list_element *add_set_enum_cmd (char *name,
- enum command_class class,
- const char *enumlist[],
- const char **var,
- char *doc,
- struct cmd_list_element **list);
-
/* Method for show a set/show variable's VALUE on FILE. If this
method isn't supplied deprecated_show_value_hack() is called (which
is not good). */
@@ -348,9 +332,6 @@ 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 *deprecated_add_show_from_set (struct cmd_list_element *,
- struct cmd_list_element **);
-
/* Do a "show" command for each thing on a command list. */
extern void cmd_show_list (struct cmd_list_element *, int, char *);
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 4e0ca9d..cf9085f 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -469,21 +469,11 @@ static const char *scheduler_enums[] = {
static void
set_schedlock_func (char *args, int from_tty, struct cmd_list_element *c)
{
- /* 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?). */
- if (cmd_type (c) == set_cmd)
- if (!target_can_lock_scheduler)
- {
- scheduler_mode = schedlock_off;
- error (_("Target '%s' cannot support this command."), target_shortname);
- }
+ if (!target_can_lock_scheduler)
+ {
+ scheduler_mode = schedlock_off;
+ error (_("Target '%s' cannot support this command."), target_shortname);
+ }
}
diff --git a/gdb/kod.c b/gdb/kod.c
index 6d13e1b..7d9f5be 100644
--- a/gdb/kod.c
+++ b/gdb/kod.c
@@ -134,19 +134,6 @@ kod_set_os (char *arg, int from_tty, struct cmd_list_element *command)
{
char *p;
- /* 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?). */
-
- if (cmd_type (command) != set_cmd)
- return;
-
/* If we had already had an open OS, close it. */
if (gdb_kod_close)
(*gdb_kod_close) ();
generated by cgit v1.1 at 2024-12-20 01:26:09 +0000