Rewrote PHP X3 DB parser function sample code as a class and faster code

[irc/evilnet/x3.git] / src / global.c

diff --git a/src/global.c b/src/global.c
index 06d1237dad7e63252863ce3d56e2e1bb37732130..c0a8e5ff898c5a4d03180e0f1e770684f5275fb7 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -351,16 +351,6 @@ notice_target(const char *target, struct globalMessage *message)
     send_target_message(4, target, global, "%s", message->message);
 }
 
-static int
-notice_channel(const char *key, void *data, void *extra)
-{
-    struct chanNode *channel = data;
-    /* It should be safe to assume channel is not NULL. */
-    if(channel->channel_info)
-       notice_target(key, extra);
-    return 0;
-}
-
 static void
 message_send(struct globalMessage *message)
 {
@@ -728,7 +718,7 @@ static GLOBAL_FUNC(cmd_messages)
 }
 
 static int
-global_process_user(struct userNode *user)
+global_process_user(struct userNode *user, UNUSED_ARG(void *extra))
 {
     if(IsLocal(user) || self->uplink->burst || user->uplink->burst)
         return 0;
@@ -750,14 +740,14 @@ global_process_user(struct userNode *user)
 }
 
 static void
-global_process_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
+global_process_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle), UNUSED_ARG(void *extra))
 {
     if(IsHelper(user))
        send_messages(user, MESSAGE_RECIPIENT_HELPERS, 0);
 }
 
 static void
-global_process_oper(struct userNode *user)
+global_process_oper(struct userNode *user, UNUSED_ARG(void *extra))
 {
     if(user->uplink->burst)
         return;
@@ -841,7 +831,7 @@ global_saxdb_write(struct saxdb_context *ctx)
 }
 
 static void
-global_db_cleanup(void)
+global_db_cleanup(UNUSED_ARG(void *extra))
 {
     while(messageList)
         message_del(messageList);
@@ -853,9 +843,9 @@ init_global(const char *nick)
     struct chanNode *chan;
     unsigned int i;
     G_LOG = log_register_type("Global", "file:global.log");
-    reg_new_user_func(global_process_user);
-    reg_auth_func(global_process_auth);
-    reg_oper_func(global_process_oper);
+    reg_new_user_func(global_process_user, NULL);
+    reg_auth_func(global_process_auth, NULL);
+    reg_oper_func(global_process_oper, NULL);
 
     conf_register_reload(global_conf_read);
 
@@ -881,6 +871,6 @@ init_global(const char *nick)
     }
 
     saxdb_register("Global", global_saxdb_read, global_saxdb_write);
-    reg_exit_func(global_db_cleanup);
+    reg_exit_func(global_db_cleanup, NULL);
     message_register_table(msgtab);
 }