X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/af81d5a0b09446188fd6f9c292b51519f2c1cedd..45be325cd2a8fcedc7fe71adbe70208d0d16aec2:/src/supported.c

diff --git a/src/supported.c b/src/supported.c
index 9dd8395..b062d55 100644
--- a/src/supported.c
+++ b/src/supported.c
@@ -81,7 +81,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "common.h"
 #include "numeric.h"
@@ -104,7 +103,7 @@ add_isupport(const char *name, const char *(*func)(const void *), const void *pa
 {
 	struct isupportitem *item;
 
-	item = MyMalloc(sizeof(struct isupportitem));
+	item = rb_malloc(sizeof(struct isupportitem));
 	item->name = name;
 	item->func = func;
 	item->param = param;
@@ -117,14 +116,14 @@ delete_isupport(const char *name)
 	rb_dlink_node *ptr, *next_ptr;
 	struct isupportitem *item;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, isupportlist.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, isupportlist.head)
 	{
 		item = ptr->data;
 
 		if (!strcmp(item->name, name))
 		{
 			rb_dlinkDelete(ptr, &isupportlist);
-			MyFree(item);
+			rb_free(item);
 		}
 	}
 }
@@ -150,7 +149,7 @@ show_isupport(struct Client *client_p)
 	extra_space += strlen(me.name) + 1 + strlen(form_str(RPL_ISUPPORT));
 
 	nchars = extra_space, nparams = 0, buf[0] = '\0';
-	DLINK_FOREACH(ptr, isupportlist.head)
+	RB_DLINK_FOREACH(ptr, isupportlist.head)
 	{
 		item = ptr->data;
 		value = (*item->func)(item->param);
@@ -163,12 +162,12 @@ show_isupport(struct Client *client_p)
 			nchars = extra_space, nparams = 0, buf[0] = '\0';
 		}
 		if (nparams > 0)
-			strlcat(buf, " ", sizeof buf), nchars++;
-		strlcat(buf, item->name, sizeof buf);
+			rb_strlcat(buf, " ", sizeof buf), nchars++;
+		rb_strlcat(buf, item->name, sizeof buf);
 		if (!EmptyString(value))
 		{
-			strlcat(buf, "=", sizeof buf);
-			strlcat(buf, value, sizeof buf);
+			rb_strlcat(buf, "=", sizeof buf);
+			rb_strlcat(buf, value, sizeof buf);
 		}
 		nchars += l;
 		nparams++;