From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 83BF4397202C for ; Wed, 14 Jul 2021 04:57:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 83BF4397202C X-ASG-Debug-ID: 1626238642-0c856e6cd51c9e600001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id 0Lj9fmjTa7G0qmS9 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Jul 2021 00:57:22 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id 003A7441B21; Wed, 14 Jul 2021 00:57:21 -0400 (EDT) From: Simon Marchi X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Subject: [PATCH 13/16] gdb: remove cmd_list_element::function::sfunc Date: Wed, 14 Jul 2021 00:55:17 -0400 X-ASG-Orig-Subj: [PATCH 13/16] gdb: remove cmd_list_element::function::sfunc Message-Id: <20210714045520.1623120-14-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210714045520.1623120-1-simon.marchi@polymtl.ca> References: <20210714045520.1623120-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1626238642 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 22551 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.91193 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-Spam-Status: No, score=-16.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_QUARANTINE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 04:57:27 -0000 I don't understand what the sfunc function type in cmd_list_element::function is for. Compared to cmd_simple_func_ftype, it has an extra cmd_list_element parameter, giving the callback access to the cmd_list_element for the command being invoked. This allows registering the same callback with many commands, and alter the behavior using the cmd_list_element's context. >From the comment in cmd_list_element, it sounds like at some point it was the callback function type for set and show functions, hence the "s". But nowadays, it's used for many more commands that need to access the cmd_list_element object (see add_catch_command for example). I don't really see the point of having sfunc at all, since do_sfunc is just a trivial shim that changes the order of the arguments. All commands using sfunc could just as well set cmd_list_element::func to their callback directly. Therefore, remove the sfunc field in cmd_list_element and everything that goes with it. Rename cmd_const_sfunc_ftype to cmd_func_ftype and use it for cmd_list_element::func, as well as for the add_setshow commands. Change-Id: I1eb96326c9b511c293c76996cea0ebc51c70fac0 --- gdb/breakpoint.c | 6 ++-- gdb/breakpoint.h | 2 +- gdb/cli/cli-decode.c | 66 +++++++++++++++---------------------------- gdb/cli/cli-decode.h | 8 ++---- gdb/cli/cli-dump.c | 2 +- gdb/cli/cli-setshow.c | 5 ++-- gdb/command.h | 30 +++++++++----------- gdb/guile/scm-cmd.c | 3 +- gdb/guile/scm-param.c | 2 +- gdb/python/py-cmd.c | 3 +- gdb/target.c | 4 +-- gdb/tui/tui-layout.c | 3 +- 12 files changed, 52 insertions(+), 82 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 7fd23348a8e8..89af44ee4c6b 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -15204,7 +15204,7 @@ static struct cmd_list_element *tcatch_cmdlist; void add_catch_command (const char *name, const char *docstring, - cmd_const_sfunc_ftype *sfunc, + cmd_func_ftype *func, completer_ftype *completer, void *user_data_catch, void *user_data_tcatch) @@ -15213,13 +15213,13 @@ add_catch_command (const char *name, const char *docstring, command = add_cmd (name, class_breakpoint, docstring, &catch_cmdlist); - set_cmd_sfunc (command, sfunc); + command->func = func; command->set_context (user_data_catch); set_cmd_completer (command, completer); command = add_cmd (name, class_breakpoint, docstring, &tcatch_cmdlist); - set_cmd_sfunc (command, sfunc); + command->func = func; command->set_context (user_data_tcatch); set_cmd_completer (command, completer); } diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index fe68730f1651..ab65f41a91b5 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1347,7 +1347,7 @@ extern void initialize_breakpoint_ops (void); extern void add_catch_command (const char *name, const char *docstring, - cmd_const_sfunc_ftype *sfunc, + cmd_func_ftype *func, completer_ftype *completer, void *user_data_catch, void *user_data_tcatch); diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 3c39e47ac69b..06f3de0f038a 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -91,13 +91,8 @@ static void print_help_for_command (struct cmd_list_element *c, bool recurse, struct ui_file *stream); - -/* Set the callback function for the specified command. For each both - the commands callback and func() are set. The latter set to a - bounce function (unless simple_func / sfunc is NULL that is). */ - static void -do_simple_func (struct cmd_list_element *c, const char *args, int from_tty) +do_simple_func (const char *args, int from_tty, cmd_list_element *c) { c->function.simple_func (args, from_tty); } @@ -113,22 +108,6 @@ set_cmd_simple_func (struct cmd_list_element *cmd, cmd_simple_func_ftype *simple cmd->function.simple_func = simple_func; } -static void -do_sfunc (struct cmd_list_element *c, const char *args, int from_tty) -{ - c->function.sfunc (args, from_tty, c); -} - -void -set_cmd_sfunc (struct cmd_list_element *cmd, cmd_const_sfunc_ftype *sfunc) -{ - if (sfunc == NULL) - cmd->func = NULL; - else - cmd->func = do_sfunc; - cmd->function.sfunc = sfunc; -} - int cmd_simple_func_eq (struct cmd_list_element *cmd, cmd_simple_func_ftype *simple_func) { @@ -401,7 +380,7 @@ add_basic_prefix_cmd (const char *name, enum command_class theclass, struct cmd_list_element *cmd = add_prefix_cmd (name, theclass, nullptr, doc, subcommands, allow_unknown, list); - set_cmd_sfunc (cmd, do_prefix_cmd); + cmd->func = do_prefix_cmd; return cmd; } @@ -424,7 +403,7 @@ add_show_prefix_cmd (const char *name, enum command_class theclass, struct cmd_list_element *cmd = add_prefix_cmd (name, theclass, nullptr, doc, subcommands, allow_unknown, list); - set_cmd_sfunc (cmd, do_show_prefix_cmd); + cmd->func = do_show_prefix_cmd; return cmd; } @@ -468,10 +447,10 @@ not_just_help_class_command (const char *args, int from_tty) { } -/* This is an empty "sfunc". */ +/* This is an empty cmd func. */ static void -empty_sfunc (const char *args, int from_tty, struct cmd_list_element *c) +empty_func (const char *args, int from_tty, cmd_list_element *c) { } @@ -500,7 +479,7 @@ add_set_or_show_cmd (const char *name, c->var = var; /* This needs to be something besides NULL so that this isn't treated as a help class. */ - set_cmd_sfunc (c, empty_sfunc); + c->func = empty_func; return c; } @@ -519,7 +498,7 @@ add_setshow_cmd_full (const char *name, var_types var_type, void *var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -544,7 +523,7 @@ add_setshow_cmd_full (const char *name, set->doc_allocated = 1; if (set_func != NULL) - set_cmd_sfunc (set, set_func); + set->func = set_func; show = add_set_or_show_cmd (name, show_cmd, theclass, var_type, var, full_show_doc, show_list); @@ -570,7 +549,7 @@ add_setshow_enum_cmd (const char *name, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -598,7 +577,7 @@ add_setshow_auto_boolean_cmd (const char *name, enum auto_boolean *var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -627,7 +606,7 @@ set_show_commands add_setshow_boolean_cmd (const char *name, enum command_class theclass, bool *var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -651,7 +630,7 @@ add_setshow_filename_cmd (const char *name, enum command_class theclass, char **var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -675,7 +654,7 @@ add_setshow_string_cmd (const char *name, enum command_class theclass, char **var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -700,7 +679,7 @@ add_setshow_string_noescape_cmd (const char *name, enum command_class theclass, char **var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -725,7 +704,7 @@ add_setshow_optional_filename_cmd (const char *name, enum command_class theclass char **var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -769,7 +748,7 @@ add_setshow_integer_cmd (const char *name, enum command_class theclass, int *var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -795,7 +774,7 @@ add_setshow_uinteger_cmd (const char *name, enum command_class theclass, unsigned int *var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -821,7 +800,7 @@ add_setshow_zinteger_cmd (const char *name, enum command_class theclass, int *var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -839,7 +818,7 @@ add_setshow_zuinteger_unlimited_cmd (const char *name, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -865,7 +844,7 @@ add_setshow_zuinteger_cmd (const char *name, enum command_class theclass, unsigned int *var, const char *set_doc, const char *show_doc, const char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) @@ -2159,7 +2138,7 @@ cmd_func (struct cmd_list_element *cmd, const char *args, int from_tty) if (cmd->suppress_notification != NULL) restore_suppress.emplace (cmd->suppress_notification, 1); - (*cmd->func) (cmd, args, from_tty); + cmd->func (args, from_tty, cmd); } else error (_("Invalid command")); @@ -2168,6 +2147,5 @@ cmd_func (struct cmd_list_element *cmd, const char *args, int from_tty) int cli_user_command_p (struct cmd_list_element *cmd) { - return (cmd->theclass == class_user - && (cmd->func == do_simple_func || cmd->func == do_sfunc)); + return cmd->theclass == class_user && cmd->func == do_simple_func; } diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h index 4cbdf7ff6d17..651d1ef8abb7 100644 --- a/gdb/cli/cli-decode.h +++ b/gdb/cli/cli-decode.h @@ -168,8 +168,8 @@ struct cmd_list_element cagney/2002-02-02: This function signature is evolving. For the moment suggest sticking with either set_cmd_cfunc() or set_cmd_sfunc(). */ - void (*func) (struct cmd_list_element *c, const char *args, int from_tty) - = nullptr; + cmd_func_ftype *func; + /* The command's real callback. At present func() bounces through to one of the below. */ union @@ -179,10 +179,6 @@ struct cmd_list_element cmd_list_element parameter. do_simple_func is installed as FUNC, and acts as a shim between the two. */ cmd_simple_func_ftype *simple_func; - - /* If type is set_cmd or show_cmd, first set the variables, - and then call this: */ - cmd_const_sfunc_ftype *sfunc; } function; diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c index efb400418042..6f7688ad58fa 100644 --- a/gdb/cli/cli-dump.c +++ b/gdb/cli/cli-dump.c @@ -331,7 +331,7 @@ struct dump_context }; static void -call_dump_func (struct cmd_list_element *c, const char *args, int from_tty) +call_dump_func (const char *args, int from_tty, cmd_list_element *c) { struct dump_context *d = (struct dump_context *) c->context (); diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index 5fd5fd15c6ad..0290acede7fa 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -517,7 +517,8 @@ do_set_command (const char *arg, int from_tty, struct cmd_list_element *c) default: error (_("gdb internal error: bad var_type in do_setshow_command")); } - c->func (c, NULL, from_tty); + + c->func (NULL, from_tty, c); if (notify_command_param_changed_p (option_changed, c)) { @@ -723,7 +724,7 @@ do_show_command (const char *arg, int from_tty, struct cmd_list_element *c) deprecated_show_value_hack (gdb_stdout, from_tty, c, val.c_str ()); } - c->func (c, NULL, from_tty); + c->func (NULL, from_tty, c); } /* Show all the settings in a list of show commands. */ diff --git a/gdb/command.h b/gdb/command.h index 1bda67c937af..baf34401a070 100644 --- a/gdb/command.h +++ b/gdb/command.h @@ -221,10 +221,8 @@ extern struct cmd_list_element *add_abbrev_prefix_cmd (const char *, struct cmd_list_element **); -typedef void cmd_const_sfunc_ftype (const char *args, int from_tty, - struct cmd_list_element *c); -extern void set_cmd_sfunc (struct cmd_list_element *cmd, - cmd_const_sfunc_ftype *sfunc); +typedef void cmd_func_ftype (const char *args, int from_tty, + cmd_list_element *c); /* A completion routine. Add possible completions to tracker. @@ -404,73 +402,73 @@ struct set_show_commands extern set_show_commands add_setshow_enum_cmd (const char *name, command_class theclass, const char *const *enumlist, const char **var, const char *set_doc, const char *show_doc, - const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_auto_boolean_cmd (const char *name, command_class theclass, auto_boolean *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_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_boolean_cmd (const char *name, command_class theclass, bool *var, const char *set_doc, - const char *show_doc, const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *show_doc, const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_filename_cmd (const char *name, command_class theclass, char **var, const char *set_doc, - const char *show_doc, const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *show_doc, const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_string_cmd (const char *name, command_class theclass, char **var, const char *set_doc, - const char *show_doc, const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *show_doc, const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_string_noescape_cmd (const char *name, command_class theclass, char **var, const char *set_doc, - const char *show_doc, const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *show_doc, const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_optional_filename_cmd (const char *name, command_class theclass, char **var, const char *set_doc, - const char *show_doc, const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *show_doc, const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_integer_cmd (const char *name, command_class theclass, int *var, const char *set_doc, - const char *show_doc, const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *show_doc, const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_uinteger_cmd (const char *name, command_class theclass, unsigned int *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_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_zinteger_cmd (const char *name, command_class theclass, int *var, const char *set_doc, - const char *show_doc, const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *show_doc, const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_zuinteger_cmd (const char *name, command_class theclass, unsigned int *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_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); extern set_show_commands add_setshow_zuinteger_unlimited_cmd (const char *name, command_class theclass, int *var, const char *set_doc, - const char *show_doc, const char *help_doc, cmd_const_sfunc_ftype *set_func, + const char *show_doc, const char *help_doc, cmd_func_ftype *set_func, show_value_ftype *show_func, cmd_list_element **set_list, cmd_list_element **show_list); diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c index ab3dad7483cc..676428577b28 100644 --- a/gdb/guile/scm-cmd.c +++ b/gdb/guile/scm-cmd.c @@ -291,8 +291,7 @@ cmdscm_destroyer (struct cmd_list_element *self, void *context) /* Called by gdb to invoke the command. */ static void -cmdscm_function (struct cmd_list_element *command, - const char *args, int from_tty) +cmdscm_function (const char *args, int from_tty, cmd_list_element *command) { command_smob *c_smob/*obj*/ = (command_smob *) command->context (); SCM arg_scm, tty_scm, result; diff --git a/gdb/guile/scm-param.c b/gdb/guile/scm-param.c index c052d04974ae..44ea167be277 100644 --- a/gdb/guile/scm-param.c +++ b/gdb/guile/scm-param.c @@ -353,7 +353,7 @@ static set_show_commands add_setshow_generic (enum var_types param_type, enum command_class cmd_class, char *cmd_name, param_smob *self, char *set_doc, char *show_doc, char *help_doc, - cmd_const_sfunc_ftype *set_func, + cmd_func_ftype *set_func, show_value_ftype *show_func, struct cmd_list_element **set_list, struct cmd_list_element **show_list) diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c index 0467ebd67349..94608e0bbcfd 100644 --- a/gdb/python/py-cmd.c +++ b/gdb/python/py-cmd.c @@ -100,8 +100,7 @@ cmdpy_destroyer (struct cmd_list_element *self, void *context) /* Called by gdb to invoke the command. */ static void -cmdpy_function (struct cmd_list_element *command, - const char *args, int from_tty) +cmdpy_function (const char *args, int from_tty, cmd_list_element *command) { cmdpy_object *obj = (cmdpy_object *) command->context (); diff --git a/gdb/target.c b/gdb/target.c index 787528981917..e7ef1d5eee2c 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -876,7 +876,7 @@ information on the arguments for a particular protocol, type\n\ &targetlist, 0, &cmdlist); c = add_cmd (t.shortname, no_class, t.doc, &targetlist); c->set_context ((void *) &t); - set_cmd_sfunc (c, open_target); + c->func = open_target; if (completer != NULL) set_cmd_completer (c, completer); } @@ -892,7 +892,7 @@ add_deprecated_target_alias (const target_info &tinfo, const char *alias) /* If we use add_alias_cmd, here, we do not get the deprecated warning, see PR cli/15104. */ c = add_cmd (alias, no_class, tinfo.doc, &targetlist); - set_cmd_sfunc (c, open_target); + c->func = open_target; c->set_context ((void *) &tinfo); alt = xstrprintf ("target %s", tinfo.shortname); deprecate_cmd (c, alt); diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index f9c94dea96cd..2dfc51935d96 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -169,8 +169,7 @@ find_layout (tui_layout_split *layout) /* Function to set the layout. */ static void -tui_apply_layout (struct cmd_list_element *command, - const char *args, int from_tty) +tui_apply_layout (const char *args, int from_tty, cmd_list_element *command) { tui_layout_split *layout = (tui_layout_split *) command->context (); -- 2.32.0