FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb: remove context parameter from add_setshow_enum_cmd

Browse source 
I propose removing the context parameter from add_setshow_enum_cmd.  It
was useful before add_setshow_enum_cmd returned both created commands,
as the caller couldn't easily set the context itself.  But now, I think
it's fine to just let the caller do it.

gdb/ChangeLog:

	* command.h (add_setshow_enum_cmd): Remove context parameter.
	* cli/cli-decode.c (add_setshow_enum_cmd): Likewise, and don't
	set context.
	* cli/cli-style.c (cli_style_option::add_setshow_commands): Set
	context here.

Change-Id: I377c4e6820ec9d5069492ed28f4cba342ce1336e
This commit is contained in:
Simon Marchi 2021-06-25 21:38:25 -04:00
parent d6ff04a343
commit 4c0ba02a74
4 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2021-06-25 Simon Marchi <simon.marchi@polymtl.ca>
* command.h (add_setshow_enum_cmd): Remove context parameter.
* cli/cli-decode.c (add_setshow_enum_cmd): Likewise, and don't
set context.
* cli/cli-style.c (cli_style_option::add_setshow_commands): Set
context here.
2021-06-25 Simon Marchi <simon.marchi@polymtl.ca>
* cli/cli-decode.h (struct cmd_list_element) <set_context>: Add

7
gdb/cli/cli-decode.c
View file

@ -571,8 +571,7 @@ add_setshow_enum_cmd (const char *name,
cmd_const_sfunc_ftype *set_func,
show_value_ftype *show_func,
struct cmd_list_element **set_list,
struct cmd_list_element **show_list,
void *context)
struct cmd_list_element **show_list)
{
set_show_commands commands
= add_setshow_cmd_full (name, theclass, var_enum, var,
@ -580,10 +579,6 @@ add_setshow_enum_cmd (const char *name,
set_func, show_func,
set_list, show_list);
commands.set->enums = enumlist;
commands.set->set_context (context);
commands.show->set_context (context);
return commands;
}

62
gdb/cli/cli-style.c
View file

@ -230,32 +230,46 @@ cli_style_option::add_setshow_commands (enum command_class theclass,
0, set_list);
add_show_prefix_cmd (m_name, no_class, prefix_doc, &m_show_list,
0, show_list);
set_show_commands commands;
commands = add_setshow_enum_cmd
("foreground", theclass, cli_colors,
&m_foreground,
_("Set the foreground color for this property."),
_("Show the foreground color for this property."),
nullptr,
do_set_value,
do_show_foreground,
&m_set_list, &m_show_list);
commands.set->set_context (this);
commands.show->set_context (this);
commands = add_setshow_enum_cmd
("background", theclass, cli_colors,
&m_background,
_("Set the background color for this property."),
_("Show the background color for this property."),
nullptr,
do_set_value,
do_show_background,
&m_set_list, &m_show_list);
commands.set->set_context (this);
commands.show->set_context (this);
add_setshow_enum_cmd ("foreground", theclass, cli_colors,
&m_foreground,
_("Set the foreground color for this property."),
_("Show the foreground color for this property."),
nullptr,
do_set_value,
do_show_foreground,
&m_set_list, &m_show_list, (void *) this);
add_setshow_enum_cmd ("background", theclass, cli_colors,
&m_background,
_("Set the background color for this property."),
_("Show the background color for this property."),
nullptr,
do_set_value,
do_show_background,
&m_set_list, &m_show_list, (void *) this);
if (!skip_intensity)
add_setshow_enum_cmd ("intensity", theclass, cli_intensities,
&m_intensity,
_("Set the display intensity for this property."),
_("Show the display intensity for this property."),
nullptr,
do_set_value,
do_show_intensity,
&m_set_list, &m_show_list, (void *) this);
{
commands = add_setshow_enum_cmd
("intensity", theclass, cli_intensities,
&m_intensity,
_("Set the display intensity for this property."),
_("Show the display intensity for this property."),
nullptr,
do_set_value,
do_show_intensity,
&m_set_list, &m_show_list);
commands.set->set_context (this);
commands.show->set_context (this);
}
}
static cmd_list_element *style_set_list;

2
gdb/command.h
View file

@ -403,7 +403,7 @@ extern set_show_commands add_setshow_enum_cmd
const char **var, const char *set_doc, const char *show_doc,
const char *help_doc, cmd_const_sfunc_ftype *set_func,
show_value_ftype *show_func, cmd_list_element **set_list,
cmd_list_element **show_list, void *context = nullptr);
cmd_list_element **show_list);
extern set_show_commands add_setshow_auto_boolean_cmd
(const char *name, command_class theclass, auto_boolean *var,