X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8e69bb4e903f428b14e2950cce9be39dc8ddd12c..016746cfc222a0df1fc8892e0930ab9c2790b69e:/src/class.c

diff --git a/src/class.c b/src/class.c
index fa3f97e..4b4769e 100644
--- a/src/class.c
+++ b/src/class.c
@@ -27,7 +27,6 @@
 #include "stdinc.h"
 #include "config.h"
 
-#include "tools.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
@@ -36,9 +35,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "send.h"
-#include "irc_string.h"
-#include "memory.h"
-#include "patricia.h"
+#include "match.h"
 
 #define BAD_CONF_CLASS          -1
 #define BAD_PING                -2
@@ -52,14 +49,14 @@ make_class(void)
 {
 	struct Class *tmp;
 
-	tmp = (struct Class *) MyMalloc(sizeof(struct Class));
+	tmp = rb_malloc(sizeof(struct Class));
 
 	ConFreq(tmp) = DEFAULT_CONNECTFREQUENCY;
 	PingFreq(tmp) = DEFAULT_PINGFREQUENCY;
 	MaxUsers(tmp) = 1;
 	MaxSendq(tmp) = DEFAULT_SENDQ;
 
-	tmp->ip_limits = New_Patricia(PATRICIA_BITS);
+	tmp->ip_limits = rb_new_patricia(PATRICIA_BITS);
 	return tmp;
 }
 
@@ -67,10 +64,10 @@ void
 free_class(struct Class *tmp)
 {
 	if(tmp->ip_limits)
-		Destroy_Patricia(tmp->ip_limits, NULL);
+		rb_destroy_patricia(tmp->ip_limits, NULL);
 
-	MyFree(tmp->class_name);
-	MyFree(tmp);
+	rb_free(tmp->class_name);
+	rb_free(tmp);
 
 }
 
@@ -275,7 +272,7 @@ void
 initclass()
 {
 	default_class = make_class();
-	DupString(ClassName(default_class), "default");
+	ClassName(default_class) = rb_strdup("default");
 }
 
 /*