Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 43186ac553ebe5bb6a63a19286a6395794443b5f..fbb2e4adfecbb149b02f88fb34fcb8af9570512a 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -254,10 +253,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
                        flags = CHFL_CHANOP;
                }
 
-               if((dlink_list_length(&source_p->user->channel) >=
+               if((rb_dlink_list_length(&source_p->user->channel) >=
                    (unsigned long) ConfigChannel.max_chans_per_user) &&
                   (!IsOper(source_p) ||
-                   (dlink_list_length(&source_p->user->channel) >=
+                   (rb_dlink_list_length(&source_p->user->channel) >=
                     (unsigned long) ConfigChannel.max_chans_per_user * 3)))
                {
                        sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
@@ -400,7 +399,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
        int isnew;
        int keep_our_modes = YES;
        int keep_new_modes = YES;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
        /* special case for join 0 */
        if((parv[1][0] == '0') && (parv[1][1] == '\0') && parc == 2)
@@ -470,7 +469,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
                set_final_mode(&mode, &chptr->mode);
                chptr->mode = mode;
                remove_our_modes(chptr, source_p);
-               DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
+               RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
                {
                        del_invite(chptr, ptr->data);
                }
@@ -532,7 +531,7 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 {
        struct membership *msptr;
        struct Channel *chptr = NULL;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
        /* Finish the flood grace period... */
        if(MyClient(source_p) && !IsFloodDone(source_p))
@@ -584,30 +583,6 @@ check_channel_name_loc(struct Client *source_p, const char *name)
        return 1;
 }
 
-struct mode_letter
-{
-       int mode;
-       char letter;
-};
-
-static struct mode_letter flags[] = {
-       {MODE_NOPRIVMSGS, 'n'},
-       {MODE_TOPICLIMIT, 't'},
-       {MODE_SECRET, 's'},
-       {MODE_MODERATED, 'm'},
-       {MODE_INVITEONLY, 'i'},
-       {MODE_PRIVATE, 'p'},
-       {MODE_REGONLY, 'r'},
-       {MODE_EXLIMIT, 'L'},
-       {MODE_PERMANENT, 'P'},
-       {MODE_NOCOLOR, 'c'},
-       {MODE_FREEINVITE, 'g'},
-       {MODE_OPMODERATE, 'z'},
-       {MODE_FREETARGET, 'F'},
-       {MODE_DISFORWARD, 'Q'},
-       {0, 0}
-};
-
 static void
 set_final_mode(struct Mode *mode, struct Mode *oldmode)
 {
@@ -617,30 +592,30 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
        int i;
 
        /* ok, first get a list of modes we need to add */
-       for(i = 0; flags[i].letter; i++)
+       for(i = 0; chmode_flags[i].letter; i++)
        {
-               if((mode->mode & flags[i].mode) && !(oldmode->mode & flags[i].mode))
+               if((mode->mode & chmode_flags[i].mode) && !(oldmode->mode & chmode_flags[i].mode))
                {
                        if(dir != MODE_ADD)
                        {
                                *mbuf++ = '+';
                                dir = MODE_ADD;
                        }
-                       *mbuf++ = flags[i].letter;
+                       *mbuf++ = chmode_flags[i].letter;
                }
        }
 
        /* now the ones we need to remove. */
-       for(i = 0; flags[i].letter; i++)
+       for(i = 0; chmode_flags[i].letter; i++)
        {
-               if((oldmode->mode & flags[i].mode) && !(mode->mode & flags[i].mode))
+               if((oldmode->mode & chmode_flags[i].mode) && !(mode->mode & chmode_flags[i].mode))
                {
                        if(dir != MODE_DEL)
                        {
                                *mbuf++ = '-';
                                dir = MODE_DEL;
                        }
-                       *mbuf++ = flags[i].letter;
+                       *mbuf++ = chmode_flags[i].letter;
                }
        }
 
@@ -661,7 +636,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
                        dir = MODE_DEL;
                }
                *mbuf++ = 'k';
-               len = ircsprintf(pbuf, "%s ", oldmode->key);
+               len = rb_sprintf(pbuf, "%s ", oldmode->key);
                pbuf += len;
        }
        if(oldmode->join_num && !mode->join_num)
@@ -690,7 +665,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
                        dir = MODE_ADD;
                }
                *mbuf++ = 'l';
-               len = ircsprintf(pbuf, "%d ", mode->limit);
+               len = rb_sprintf(pbuf, "%d ", mode->limit);
                pbuf += len;
        }
        if(mode->key[0] && strcmp(oldmode->key, mode->key))
@@ -701,7 +676,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
                        dir = MODE_ADD;
                }
                *mbuf++ = 'k';
-               len = ircsprintf(pbuf, "%s ", mode->key);
+               len = rb_sprintf(pbuf, "%s ", mode->key);
                pbuf += len;
        }
        if(mode->join_num && (oldmode->join_num != mode->join_num || oldmode->join_time != mode->join_time))
@@ -712,7 +687,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
                        dir = MODE_ADD;
                }
                *mbuf++ = 'j';
-               len = ircsprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
+               len = rb_sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
                pbuf += len;
        }
        if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && ConfigChannel.use_forward)
@@ -723,7 +698,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
                        dir = MODE_ADD;
                }
                *mbuf++ = 'f';
-               len = ircsprintf(pbuf, "%s ", mode->forward);
+               len = rb_sprintf(pbuf, "%s ", mode->forward);
                pbuf += len;
        }
        *mbuf = '\0';
@@ -740,7 +715,7 @@ static void
 remove_our_modes(struct Channel *chptr, struct Client *source_p)
 {
        struct membership *msptr;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        char lmodebuf[MODEBUFLEN];
        char *lpara[MAXMODEPARAMS];
        int count = 0;
@@ -752,7 +727,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
        for(i = 0; i < MAXMODEPARAMS; i++)
                lpara[i] = NULL;
 
-       DLINK_FOREACH(ptr, chptr->members.head)
+       RB_DLINK_FOREACH(ptr, chptr->members.head)
        {
                msptr = ptr->data;