From 51a7588bc4acd45b0aebc5c021f5f196167f8962 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 30 Jul 2016 21:22:45 +0100 Subject: [PATCH] Add typedefs to C plugin API --- src/plugins/profapi.c | 6 +++--- src/plugins/profapi.h | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/plugins/profapi.c b/src/plugins/profapi.c index e5f46cb4..9b99a944 100644 --- a/src/plugins/profapi.c +++ b/src/plugins/profapi.c @@ -44,9 +44,9 @@ int (*prof_cons_bad_cmd_usage)(const char *const cmd) = NULL; void (*_prof_register_command)(const char *filename, const char *command_name, int min_args, int max_args, char **synopsis, const char *description, char *arguments[][2], char **examples, - void(*callback)(char **args)) = NULL; + CMD_CB callback) = NULL; -void (*_prof_register_timed)(const char *filename, void(*callback)(void), int interval_seconds) = NULL; +void (*_prof_register_timed)(const char *filename, TIMED_CB callback, int interval_seconds) = NULL; void (*_prof_completer_add)(const char *filename, const char *key, char **items) = NULL; void (*_prof_completer_remove)(const char *filename, const char *key, char **items) = NULL; @@ -67,7 +67,7 @@ void (*prof_log_info)(const char *message) = NULL; void (*prof_log_warning)(const char *message) = NULL; void (*prof_log_error)(const char *message) = NULL; -void (*_prof_win_create)(const char *filename, PROF_WIN_TAG win, void(*input_handler)(PROF_WIN_TAG win, char *line)) = NULL; +void (*_prof_win_create)(const char *filename, PROF_WIN_TAG win, WINDOW_CB input_handler) = NULL; int (*prof_win_exists)(PROF_WIN_TAG win) = NULL; int (*prof_win_focus)(PROF_WIN_TAG win) = NULL; int (*prof_win_show)(PROF_WIN_TAG win, char *line) = NULL; diff --git a/src/plugins/profapi.h b/src/plugins/profapi.h index c75b8f03..58e41fc1 100644 --- a/src/plugins/profapi.h +++ b/src/plugins/profapi.h @@ -43,6 +43,9 @@ #define prof_win_create(win, input_handler) _prof_win_create(__FILE__, win, input_handler) typedef char* PROF_WIN_TAG; +typedef void(*CMD_CB)(char **args); +typedef void(*TIMED_CB)(void); +typedef void(*WINDOW_CB)(PROF_WIN_TAG win, char *line); void (*prof_cons_alert)(void); int (*prof_cons_show)(const char * const message); @@ -51,9 +54,9 @@ int (*prof_cons_bad_cmd_usage)(const char *const cmd); void (*_prof_register_command)(const char *filename, const char *command_name, int min_args, int max_args, char **synopsis, const char *description, char *arguments[][2], char **examples, - void(*callback)(char **args)); + CMD_CB callback); -void (*_prof_register_timed)(const char *filename, void(*callback)(void), int interval_seconds); +void (*_prof_register_timed)(const char *filename, TIMED_CB callback, int interval_seconds); void (*_prof_completer_add)(const char *filename, const char *key, char **items); void (*_prof_completer_remove)(const char *filename, const char *key, char **items); @@ -74,7 +77,7 @@ void (*prof_log_info)(const char *message); void (*prof_log_warning)(const char *message); void (*prof_log_error)(const char *message); -void (*_prof_win_create)(const char *filename, PROF_WIN_TAG win, void(*input_handler)(PROF_WIN_TAG win, char *line)); +void (*_prof_win_create)(const char *filename, PROF_WIN_TAG win, WINDOW_CB input_handler); int (*prof_win_exists)(PROF_WIN_TAG win); int (*prof_win_focus)(PROF_WIN_TAG win); int (*prof_win_show)(PROF_WIN_TAG win, char *line);