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/command.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gdb/command.h') diff --git a/gdb/command.h b/gdb/command.h index bc9728f..5761447 100644 --- a/gdb/command.h +++ b/gdb/command.h @@ -113,6 +113,8 @@ var_types; /* This structure records one command'd definition. */ struct cmd_list_element; +typedef void cmd_cfunc_ftype (char *args, int from_tty); + /* Forward-declarations of the entry-points of cli/cli-decode.c. */ /* API to the manipulation of command lists. */ @@ -120,7 +122,8 @@ struct cmd_list_element; extern int valid_user_defined_cmd_name_p (const char *name); extern struct cmd_list_element *add_cmd (const char *, enum command_class, - void (*fun) (char *, int), char *, + cmd_cfunc_ftype *fun, + char *, struct cmd_list_element **); extern struct cmd_list_element *add_alias_cmd (const char *, const char *, @@ -128,7 +131,7 @@ extern struct cmd_list_element *add_alias_cmd (const char *, const char *, struct cmd_list_element **); extern struct cmd_list_element *add_prefix_cmd (const char *, enum command_class, - void (*fun) (char *, int), + cmd_cfunc_ftype *fun, char *, struct cmd_list_element **, char *, int, @@ -136,8 +139,7 @@ extern struct cmd_list_element *add_prefix_cmd (const char *, enum command_class extern struct cmd_list_element *add_abbrev_prefix_cmd (const char *, enum command_class, - void (*fun) (char *, - int), + cmd_cfunc_ftype *fun, char *, struct cmd_list_element **, char *, int, @@ -146,7 +148,6 @@ extern struct cmd_list_element *add_abbrev_prefix_cmd (const char *, /* Set the commands corresponding callback. */ -typedef void cmd_cfunc_ftype (char *args, int from_tty); extern void set_cmd_cfunc (struct cmd_list_element *cmd, cmd_cfunc_ftype *cfunc); @@ -163,7 +164,7 @@ extern void set_cmd_completer (struct cmd_list_element *, completer_ftype *); /* HACK: cagney/2002-02-23: Code, mostly in tracepoints.c, grubs around in cmd objects to test the value of the commands sfunc(). */ extern int cmd_cfunc_eq (struct cmd_list_element *cmd, - void (*cfunc) (char *args, int from_tty)); + cmd_cfunc_ftype *cfun); /* Each command object has a local context attached to it. */ extern void set_cmd_context (struct cmd_list_element *cmd, @@ -203,14 +204,14 @@ extern int lookup_cmd_composition (const char *text, struct cmd_list_element **cmd); extern struct cmd_list_element *add_com (const char *, enum command_class, - void (*fun) (char *, int), + cmd_cfunc_ftype *fun, char *); extern struct cmd_list_element *add_com_alias (const char *, const char *, enum command_class, int); extern struct cmd_list_element *add_info (const char *, - void (*fun) (char *, int), + cmd_cfunc_ftype *fun, char *); extern struct cmd_list_element *add_info_alias (const char *, char *, int); -- cgit v1.1