X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/7018b86a127ef4549a951369db0a797cb74ea15b..b225bf93b7eaf8d4d6b1ac172463d280b48a782f:/modules/m_monitor.c

diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index eb0dafa9..a6ce5755 100644
--- a/modules/m_monitor.c
+++ b/modules/m_monitor.c
@@ -31,7 +31,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "msg.h"
 #include "parse.h"
@@ -74,7 +73,7 @@ add_monitor(struct Client *client_p, const char *nicks)
 
 	tmp = LOCAL_COPY(nicks);
 
-	for(name = strtoken(&p, tmp, ","); name; name = strtoken(&p, NULL, ","))
+	for(name = rb_strtok_r(tmp, ",", &p); name; name = rb_strtok_r(NULL, ",", &p))
 	{
 		if(EmptyString(name) || strlen(name) > NICKLEN-1)
 			continue;
@@ -90,9 +89,9 @@ add_monitor(struct Client *client_p, const char *nicks)
 				sendto_one(client_p, "%s", offbuf);
 
 			if(p)
-				snprintf(buf, sizeof(buf), "%s,%s", name, p);
+				rb_snprintf(buf, sizeof(buf), "%s,%s", name, p);
 			else
-				snprintf(buf, sizeof(buf), "%s", name);
+				rb_snprintf(buf, sizeof(buf), "%s", name);
 
 			sendto_one(client_p, form_str(ERR_MONLISTFULL),
 					me.name, client_p->name,
@@ -171,7 +170,7 @@ del_monitor(struct Client *client_p, const char *nicks)
 
 	tmp = LOCAL_COPY(nicks);
 
-	for(name = strtoken(&p, tmp, ","); name; name = strtoken(&p, NULL, ","))
+	for(name = rb_strtok_r(tmp, ",", &p); name; name = rb_strtok_r(NULL, ",", &p))
 	{
 		if(EmptyString(name))
 			continue;