From fc6ec41a5a09a61f6880c77ba5aa50e4e78387f5 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Wed, 19 Mar 2008 23:46:29 -0400 Subject: [PATCH] Remove extraneous semicolons from end of macro uses. src/chanserv.c: Do this for dnrList. src/log.c: Do it for logList. src/mail-smtp.c: Do it for mail_queue. src/mod-helpserv.c: Do it for helpserv_botlist, helpserv_reqlist and helpserv_userlist, and their sized allocators. src/mod-memoserv.c: Do it for memoList. src/modcmd.c: Do it for svccmd_list and module_list. src/modcmd.h: Remove the extra semicolon at the end of SVCMSG_HOOK()'s definition. src/nickserv.c: Do it for handle_info_list. src/saxdb.c: Do it for int_list. --- src/chanserv.c | 2 +- src/log.c | 2 +- src/mail-smtp.c | 2 +- src/mod-helpserv.c | 12 ++++++------ src/mod-memoserv.c | 2 +- src/modcmd.c | 4 ++-- src/modcmd.h | 2 +- src/nickserv.c | 2 +- src/saxdb.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/chanserv.c b/src/chanserv.c index 7a3fad0..4fc9bb9 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -478,7 +478,7 @@ static const struct message_entry msgtab[] = { return 0; } DECLARE_LIST(dnrList, struct do_not_register *); -DEFINE_LIST(dnrList, struct do_not_register *); +DEFINE_LIST(dnrList, struct do_not_register *) static int eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, char *argv[], struct svccmd *cmd, int action); diff --git a/src/log.c b/src/log.c index 7368fbe..fe9f74a 100644 --- a/src/log.c +++ b/src/log.c @@ -73,7 +73,7 @@ static struct dict *log_types; static struct log_type *log_default; static int log_inited, log_debugged; -DEFINE_LIST(logList, struct logDestination*); +DEFINE_LIST(logList, struct logDestination*) static void log_format_audit(struct logEntry *entry); static const struct message_entry msgtab[] = { { "MSG_INVALID_FACILITY", "$b%s$b is an invalid log facility." }, diff --git a/src/mail-smtp.c b/src/mail-smtp.c index 13a6c38..9ec083d 100644 --- a/src/mail-smtp.c +++ b/src/mail-smtp.c @@ -79,7 +79,7 @@ static struct { int enabled; } smtp_conf; -DEFINE_LIST(mail_queue, struct pending_mail *); +DEFINE_LIST(mail_queue, struct pending_mail *) static void mail_println(const char *fmt, ...) { diff --git a/src/mod-helpserv.c b/src/mod-helpserv.c index 764c3a5..b211da2 100644 --- a/src/mod-helpserv.c +++ b/src/mod-helpserv.c @@ -581,16 +581,16 @@ void STRUCTNAME##_free(void *data) {\ } DECLARE_LIST(helpserv_botlist, struct helpserv_bot *); -DEFINE_LIST(helpserv_botlist, struct helpserv_bot *); -DEFINE_LIST_ALLOC(helpserv_botlist); +DEFINE_LIST(helpserv_botlist, struct helpserv_bot *) +DEFINE_LIST_ALLOC(helpserv_botlist) DECLARE_LIST(helpserv_reqlist, struct helpserv_request *); -DEFINE_LIST(helpserv_reqlist, struct helpserv_request *); -DEFINE_LIST_ALLOC(helpserv_reqlist); +DEFINE_LIST(helpserv_reqlist, struct helpserv_request *) +DEFINE_LIST_ALLOC(helpserv_reqlist) DECLARE_LIST(helpserv_userlist, struct helpserv_user *); -DEFINE_LIST(helpserv_userlist, struct helpserv_user *); -DEFINE_LIST_ALLOC(helpserv_userlist); +DEFINE_LIST(helpserv_userlist, struct helpserv_user *) +DEFINE_LIST_ALLOC(helpserv_userlist) struct helpfile *helpserv_helpfile; static struct module *helpserv_module; diff --git a/src/mod-memoserv.c b/src/mod-memoserv.c index a54faab..7b1dc3d 100644 --- a/src/mod-memoserv.c +++ b/src/mod-memoserv.c @@ -96,7 +96,7 @@ struct memo { }; DECLARE_LIST(memoList, struct memo*); -DEFINE_LIST(memoList, struct memo*); +DEFINE_LIST(memoList, struct memo*) /* memo_account.flags fields */ #define MEMO_NOTIFY_NEW 1 diff --git a/src/modcmd.c b/src/modcmd.c index 9fd76a4..f30a4e9 100644 --- a/src/modcmd.c +++ b/src/modcmd.c @@ -173,8 +173,8 @@ flags_qsort(const void *a, const void *b) { return irccasecmp(fa->name, fb->name); } -DEFINE_LIST(svccmd_list, struct svccmd*); -DEFINE_LIST(module_list, struct module*); +DEFINE_LIST(svccmd_list, struct svccmd*) +DEFINE_LIST(module_list, struct module*) static void free_service_command(void *data) { diff --git a/src/modcmd.h b/src/modcmd.h index b65c235..9ef35dc 100644 --- a/src/modcmd.h +++ b/src/modcmd.h @@ -32,7 +32,7 @@ struct modcmd; #define MODCMD_FUNC(NAME) int NAME(struct userNode *user, UNUSED_ARG(struct chanNode *channel), UNUSED_ARG(unsigned int argc), UNUSED_ARG(char **argv), UNUSED_ARG(struct svccmd *cmd)) typedef MODCMD_FUNC(modcmd_func_t); -#define SVCMSG_HOOK(NAME) int NAME(struct userNode *user, struct userNode *target, const char *text, int server_qualified); +#define SVCMSG_HOOK(NAME) int NAME(struct userNode *user, struct userNode *target, const char *text, int server_qualified) typedef SVCMSG_HOOK(svcmsg_hook_t); DECLARE_LIST(svccmd_list, struct svccmd*); diff --git a/src/nickserv.c b/src/nickserv.c index 88dcf87..9ab83c8 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -113,7 +113,7 @@ #define OPTION_FUNC(NAME) int NAME(struct userNode *user, struct handle_info *hi, UNUSED_ARG(unsigned int override), unsigned int argc, char *argv[]) typedef OPTION_FUNC(option_func_t); -DEFINE_LIST(handle_info_list, struct handle_info*); +DEFINE_LIST(handle_info_list, struct handle_info*) #define NICKSERV_MIN_PARMS(N) do { \ if (argc < N) { \ diff --git a/src/saxdb.c b/src/saxdb.c index 5787f65..b5ac422 100644 --- a/src/saxdb.c +++ b/src/saxdb.c @@ -24,7 +24,7 @@ #include "saxdb.h" #include "timeq.h" -DEFINE_LIST(int_list, int); +DEFINE_LIST(int_list, int) struct saxdb { char *name; -- 2.20.1