strtoken -> rb_strtok_r (with arguments order changes)

[irc/rqf/shadowircd.git] / modules / core / m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 2d62410123e28f83727c328b02aa724814851a48..48c8752638d9b337203793939bc57b14bac50ce5 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -39,7 +39,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "packet.h"
 
 static int m_join(struct Client *, struct Client *, int, const char **);
@@ -149,7 +148,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
         * this code has a side effect of losing keys, but..
         */
        chanlist = LOCAL_COPY(parv[1]);
-       for(name = strtoken(&p, chanlist, ","); name; name = strtoken(&p, NULL, ","))
+       for(name = rb_strtok_r(chanlist, ",", &p); name; name = rb_strtok_r(NULL, ",", &p))
        {
                /* check the length and name of channel is ok */
                if(!check_channel_name_loc(source_p, name) || (strlen(name) > LOC_CHANNELLEN))
@@ -205,17 +204,17 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
                if(*jbuf)
                        (void) strcat(jbuf, ",");
-               (void) strlcat(jbuf, name, sizeof(jbuf));
+               (void) rb_strlcat(jbuf, name, sizeof(jbuf));
        }
 
        if(parc > 2)
        {
                mykey = LOCAL_COPY(parv[2]);
-               key = strtoken(&p2, mykey, ",");
+               key = rb_strtok_r(mykey, ",", &p2);
        }
 
-       for(name = strtoken(&p, jbuf, ","); name;
-           key = (key) ? strtoken(&p2, NULL, ",") : NULL, name = strtoken(&p, NULL, ","))
+       for(name = rb_strtok_r(jbuf, ",", &p); name;
+           key = (key) ? rb_strtok_r(NULL, ",", &p2) : NULL, name = rb_strtok_r(NULL, ",", &p))
        {
                hook_data_channel_activity hook_info;