fix indentation

[irc/quakenet/newserv.git] / trusts / events.c

diff --git a/trusts/events.c b/trusts/events.c
index 34c6b0b4c6d98541e060df29fee0e72825371b61..b16d55706228c86f445d9a172433f262aa82f4a5 100644 (file)
--- a/trusts/events.c
+++ b/trusts/events.c
@@ -3,10 +3,10 @@
 
 static void __counthandler(int hooknum, void *arg);
 
-static void __newnick(int hooknum, void *arg) {
-  nick *sender = arg;
+void trusts_newnick(nick *sender, int moving) {
   uint32_t host;
   trusthost *th;
+  void *arg[2];
 
   host = irc_in_addr_v4_to_int(&sender->p_ipaddr);
   th = th_getbyhost(host);
@@ -22,18 +22,29 @@ static void __newnick(int hooknum, void *arg) {
 
   /* sucks we have to do this, at least until we get priority hooks */
   __counthandler(HOOK_TRUSTS_NEWNICK, sender);
-  triggerhook(HOOK_TRUSTS_NEWNICK, sender);
+
+  arg[0] = sender;
+  arg[1] = (void *)(long)moving;
+  triggerhook(HOOK_TRUSTS_NEWNICK, arg);
 }
 
-static void __lostnick(int hooknum, void *arg) {
-  nick *sender = arg, *np, *lp;
+static void __newnick(int hooknum, void *arg) {
+  trusts_newnick(arg, 0);
+}
+
+void trusts_lostnick(nick *sender, int moving) {
+  nick *np, *lp;
   trusthost *th = gettrusthost(sender);
+  void *arg[2];
 
   if(!th)
     return;
 
   __counthandler(HOOK_TRUSTS_LOSTNICK, sender);
-  triggerhook(HOOK_TRUSTS_LOSTNICK, sender);
+
+  arg[0] = sender;
+  arg[1] = (void *)(long)moving;
+  triggerhook(HOOK_TRUSTS_LOSTNICK, arg);
 
   /*
    * we need to erase this nick from the trusthost list
@@ -54,6 +65,10 @@ static void __lostnick(int hooknum, void *arg) {
   }
 }
 
+static void __lostnick(int hooknum, void *arg) {
+  trusts_lostnick(arg, 0);
+}
+
 static void __counthandler(int hooknum, void *arg) {
   time_t t = time(NULL);
   trusthost *th = gettrusthost((nick *)arg);
@@ -97,16 +112,7 @@ static void __dbloaded(int hooknum, void *arg) {
       __newnick(0, np);
 }
 
-void trusts_registerevents(void) {
-  registerhook(HOOK_TRUSTS_DB_LOADED, __dbloaded);
-
-  if(trustsdbloaded)
-    __dbloaded(0, NULL);
-}
-
-void trusts_deregisterevents(void) {
-  deregisterhook(HOOK_TRUSTS_DB_LOADED, __dbloaded);
-
+static void __dbclosed(int hooknum, void *arg) {
   if(!hooksregistered)
     return;
   hooksregistered = 0;
@@ -119,3 +125,18 @@ void trusts_deregisterevents(void) {
   deregisterhook(HOOK_TRUSTS_LOSTNICK, __counthandler);
 */
 }
+
+void trusts_deregisterevents(void) {
+  deregisterhook(HOOK_TRUSTS_DB_LOADED, __dbloaded);
+  deregisterhook(HOOK_TRUSTS_DB_CLOSED, __dbclosed);
+
+  __dbclosed(0, NULL);
+}
+
+void trusts_registerevents(void) {
+  registerhook(HOOK_TRUSTS_DB_LOADED, __dbloaded);
+  registerhook(HOOK_TRUSTS_DB_CLOSED, __dbclosed);
+
+  if(trustsdbloaded)
+    __dbloaded(0, NULL);
+}