monitor.{c,h} stuff for libratbox3.

[irc/rqf/shadowircd.git] / modules / m_names.c

diff --git a/modules/m_names.c b/modules/m_names.c
index e307ab9745f79b56fc717627fc06c123380b6799..bb4b238bcefd6a297b92832fb324066c353dcae2 100644 (file)
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -26,7 +26,6 @@
 
 #include "stdinc.h"
 #include "sprintf_irc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -127,7 +126,7 @@ names_global(struct Client *source_p)
        int tlen;
        int cur_len;
        int dont_show = NO;
-       dlink_node *lp, *ptr;
+       rb_dlink_node *lp, *ptr;
        struct Client *target_p;
        struct Channel *chptr = NULL;
        struct membership *msptr;
@@ -135,17 +134,17 @@ names_global(struct Client *source_p)
        char *t;
 
        /* first do all visible channels */
-       DLINK_FOREACH(ptr, global_channel_list.head)
+       RB_DLINK_FOREACH(ptr, global_channel_list.head)
        {
                chptr = ptr->data;
                channel_member_names(chptr, source_p, 0);
        }
-       cur_len = mlen = ircsprintf(buf, form_str(RPL_NAMREPLY), 
+       cur_len = mlen = rb_sprintf(buf, form_str(RPL_NAMREPLY), 
                                    me.name, source_p->name, "*", "*");
        t = buf + mlen;
 
        /* Second, do all clients in one big sweep */
-       DLINK_FOREACH(ptr, global_client_list.head)
+       RB_DLINK_FOREACH(ptr, global_client_list.head)
        {
                target_p = ptr->data;
                dont_show = NO;
@@ -160,7 +159,7 @@ names_global(struct Client *source_p)
                 * both were missed out above.  if the target is on a
                 * common channel with source, its already been shown.
                 */
-               DLINK_FOREACH(lp, target_p->user->channel.head)
+               RB_DLINK_FOREACH(lp, target_p->user->channel.head)
                {
                        msptr = lp->data;
                        chptr = msptr->chptr;
@@ -183,7 +182,7 @@ names_global(struct Client *source_p)
                        t = buf + mlen;
                }
 
-               tlen = ircsprintf(t, "%s ", target_p->name);
+               tlen = rb_sprintf(t, "%s ", target_p->name);
                cur_len += tlen;
                t += tlen;
        }