X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/555ac41f1429114e53d7b31dd34b58fd852274bc..43946961df9e7703c8877e4bbd9181507422429d:/modules/m_monitor.c?ds=sidebyside

diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index ef0f6bac..1193c69e 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;
@@ -103,11 +102,11 @@ add_monitor(struct Client *client_p, const char *nicks)
 		monptr = find_monitor(name, 1);
 
 		/* already monitoring this nick */
-		if(dlinkFind(client_p, &monptr->users))
+		if(rb_dlinkFind(client_p, &monptr->users))
 			continue;
 
-		dlinkAddAlloc(client_p, &monptr->users);
-		dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
+		rb_dlinkAddAlloc(client_p, &monptr->users);
+		rb_dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
 
 		if((target_p = find_named_person(name)) != NULL)
 		{
@@ -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;