X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..8ee12f0c437eec8aa42af7b350c7e2a3ccafedbc:/modules/m_scan.c?ds=sidebyside

diff --git a/modules/m_scan.c b/modules/m_scan.c
index 7fdb688f..23a64b35 100644
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -38,10 +38,9 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
@@ -121,8 +120,8 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 	const char *mask = NULL;
 	const char *c;
 	struct Client *target_p;
-	dlink_list *target_list = &lclient_list;	/* local clients only by default */
-	dlink_node *tn;
+	rb_dlink_list *target_list = &lclient_list;	/* local clients only by default */
+	rb_dlink_node *tn;
 	int i;
 	const char *sockhost;
 	char buf[512];
@@ -179,11 +178,11 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 		{
 			if (!ConfigFileEntry.operspy_dont_care_user_info)
 			{
-				strlcpy(buf, "UMODES", sizeof buf);
+				rb_strlcpy(buf, "UMODES", sizeof buf);
 				for (i = 2; i < parc; i++)
 				{
-					strlcat(buf, " ", sizeof buf);
-					strlcat(buf, parv[i], sizeof buf);
+					rb_strlcat(buf, " ", sizeof buf);
+					rb_strlcat(buf, parv[i], sizeof buf);
 				}
 				report_operspy(source_p, "SCAN", buf);
 			}
@@ -196,7 +195,7 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 		}
 	}
 
-	DLINK_FOREACH(tn, target_list->head)
+	RB_DLINK_FOREACH(tn, target_list->head)
 	{
 		unsigned int working_umodes = 0;
 		char maskbuf[BUFSIZE];
@@ -225,7 +224,7 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 
 		if (mask != NULL)
 		{
-			ircsnprintf(maskbuf, BUFSIZE, "%s!%s@%s",
+			rb_snprintf(maskbuf, BUFSIZE, "%s!%s@%s",
 				target_p->name, target_p->username, target_p->host);
 
 			if (!match(mask, maskbuf))