Make saxdb_context definition private.

[srvx.git] / src / modcmd.c

diff --git a/src/modcmd.c b/src/modcmd.c
index 65f8d296e58651006d111427030190cd85de9cb3..cc298a9a0cced2bf94a08923bc9b3c89ffdd2fe9 100644 (file)
--- 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) {
@@ -888,10 +888,12 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, const char *text, in
 }
 
 void
-modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot) {
+modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice) {
     struct service *service;
-    if (!(service = dict_find(services, bot->nick, NULL))) return;
+    if (!(service = dict_find(services, bot->nick, NULL)))
+        return;
     svccmd_invoke(user, service, chan, text, 0);
+    (void)is_notice;
 }
 
 struct service *
@@ -1832,8 +1834,7 @@ static MODCMD_FUNC(cmd_dump_messages) {
         reply("MSG_INTERNAL_FAILURE");
         return 0;
     }
-    if ((res = setjmp(ctx->jbuf)) != 0) {
-        ctx->complex.used = 0; /* to avoid false assert()s in close */
+    if ((res = setjmp(*saxdb_jmp_buf(ctx))) != 0) {
         saxdb_close_context(ctx);
         fclose(pf);
         reply("MCMSG_MESSAGE_DUMP_FAILED", strerror(res));