X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cc200171d7c40be3b204460f9c14d5d37e771866..0accfaf36f2acc2a8a8227b79cf0ff4ade259ae8:/src/hook.c

diff --git a/src/hook.c b/src/hook.c
index f06e6f6..79a9a10 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -38,7 +38,7 @@
  */
 #include "stdinc.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 
 hook *hooks;
 
@@ -59,6 +59,7 @@ int h_burst_finished;
 int h_server_introduced;
 int h_server_eob;
 int h_client_exit;
+int h_umode_changed;
 int h_new_local_user;
 int h_new_remote_user;
 int h_introduce_client;
@@ -66,7 +67,7 @@ int h_introduce_client;
 void
 init_hook(void)
 {
-	hooks = MyMalloc(sizeof(hook) * HOOK_INCREMENT);
+	hooks = rb_malloc(sizeof(hook) * HOOK_INCREMENT);
 
 #ifdef USE_IODEBUG_HOOKS
 	h_iosend_id = register_hook("iosend");
@@ -94,10 +95,10 @@ grow_hooktable(void)
 {
 	hook *newhooks;
 
-	newhooks = MyMalloc(sizeof(hook) * (max_hooks + HOOK_INCREMENT));
+	newhooks = rb_malloc(sizeof(hook) * (max_hooks + HOOK_INCREMENT));
 	memcpy(newhooks, hooks, sizeof(hook) * num_hooks);
 
-	MyFree(hooks);
+	rb_free(hooks);
 	hooks = newhooks;
 	max_hooks += HOOK_INCREMENT;
 }
@@ -156,7 +157,7 @@ register_hook(const char *name)
 	if((i = find_hook(name)) < 0)
 	{
 		i = find_freehookslot();
-		DupString(hooks[i].name, name);
+		hooks[i].name = rb_strdup(name);
 		num_hooks++;
 	}