From 82ae6c8d79c426e1b4d6f7b8d4be5292b3e9a8c5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 18 Nov 2012 19:24:22 -0700 Subject: use cmd_sfunc_ftype and cmd_cfunc_ftype more This patch changes a few more spots to use either cmd_sfunc_ftype or cmd_cfunc_ftype, as appropriate. This is a bit cleaner. Tested by rebuilding. 2014-07-01 Tom Tromey * breakpoint.c (add_catch_command): Use cmd_sfunc_ftype. * breakpoint.h (add_catch_command): Use cmd_sfunc_ftype. * cli/cli-decode.c (cmd_cfunc_eq, add_cmd, add_prefix_cmd) (add_abbrev_prefix_cmd, add_info, add_com): Use cmd_cfunc_ftype. * command.h (cmd_cfunc_ftype): Move earlier. (add_cmd, add_prefix_cmd, add_abbrev_prefix_cmd, cmd_cfunc_eq) (add_com, add_info): Use cmd_cfunc_ftype. --- gdb/cli/cli-decode.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gdb/cli/cli-decode.c') diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index d36ab4e..f09b777 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -134,8 +134,7 @@ set_cmd_sfunc (struct cmd_list_element *cmd, cmd_sfunc_ftype *sfunc) } int -cmd_cfunc_eq (struct cmd_list_element *cmd, - void (*cfunc) (char *args, int from_tty)) +cmd_cfunc_eq (struct cmd_list_element *cmd, cmd_cfunc_ftype *cfunc) { return cmd->func == do_cfunc && cmd->function.cfunc == cfunc; } @@ -183,7 +182,7 @@ set_cmd_completer (struct cmd_list_element *cmd, completer_ftype *completer) of *LIST). */ struct cmd_list_element * -add_cmd (const char *name, enum command_class class, void (*fun) (char *, int), +add_cmd (const char *name, enum command_class class, cmd_cfunc_ftype *fun, char *doc, struct cmd_list_element **list) { struct cmd_list_element *c @@ -329,7 +328,7 @@ add_alias_cmd (const char *name, const char *oldname, enum command_class class, struct cmd_list_element * add_prefix_cmd (const char *name, enum command_class class, - void (*fun) (char *, int), + cmd_cfunc_ftype *fun, char *doc, struct cmd_list_element **prefixlist, char *prefixname, int allow_unknown, struct cmd_list_element **list) @@ -357,7 +356,7 @@ add_prefix_cmd (const char *name, enum command_class class, struct cmd_list_element * add_abbrev_prefix_cmd (const char *name, enum command_class class, - void (*fun) (char *, int), char *doc, + cmd_cfunc_ftype *fun, char *doc, struct cmd_list_element **prefixlist, char *prefixname, int allow_unknown, struct cmd_list_element **list) { @@ -846,7 +845,7 @@ delete_cmd (const char *name, struct cmd_list_element **list, /* Add an element to the list of info subcommands. */ struct cmd_list_element * -add_info (const char *name, void (*fun) (char *, int), char *doc) +add_info (const char *name, cmd_cfunc_ftype *fun, char *doc) { return add_cmd (name, no_class, fun, doc, &infolist); } @@ -862,7 +861,7 @@ add_info_alias (const char *name, char *oldname, int abbrev_flag) /* Add an element to the list of commands. */ struct cmd_list_element * -add_com (const char *name, enum command_class class, void (*fun) (char *, int), +add_com (const char *name, enum command_class class, cmd_cfunc_ftype *fun, char *doc) { return add_cmd (name, class, fun, doc, &cmdlist); -- cgit v1.1