Argh, wrong replace caused by MS VS 2005 interface.

[irc/rqf/shadowircd.git] / src / monitor.c

diff --git a/src/monitor.c b/src/monitor.c
index 8456d6f55239e0dfd924cffd77613122d3f62c51..907c7f1ba93bfe55e565ef11a516d5aee4ac35b6 100644 (file)
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -32,13 +32,9 @@
  * $Id: monitor.c 3520 2007-06-30 22:15:35Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
-#include "memory.h"
-#include "balloc.h"
 #include "monitor.h"
 #include "hash.h"
-#include "event.h"
 #include "numeric.h"
 
 static struct monitor *monitorTable[MONITOR_HASH_SIZE];
@@ -103,7 +99,7 @@ monitor_signon(struct Client *client_p)
        if(monptr == NULL)
                return;
 
-       ircsnprintf(buf, sizeof(buf), "%s!%s@%s",
+       rb_snprintf(buf, sizeof(buf), "%s!%s@%s",
                    client_p->name, client_p->username, client_p->host);
 
        sendto_monitor(monptr, form_str(RPL_MONONLINE), me.name, "*", buf);
@@ -133,17 +129,17 @@ void
 clear_monitor(struct Client *client_p)
 {
        struct monitor *monptr;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->monitor_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->monitor_list.head)
        {
                monptr = ptr->data;
 
                /* we leave the actual entry around with no users, itll be
                 * cleaned up periodically by cleanup_monitor() --anfl
                 */
-               dlinkFindDestroy(client_p, &monptr->users);
-               free_dlink_node(ptr);
+               rb_dlinkFindDestroy(client_p, &monptr->users);
+               free_rb_dlink_node(ptr);
        }
 
        client_p->localClient->monitor_list.head = client_p->localClient->monitor_list.tail = NULL;
@@ -164,7 +160,7 @@ cleanup_monitor(void *unused)
                {
                        next_ptr = ptr->hnext;
 
-                       if(!dlink_list_length(&ptr->users))
+                       if(!rb_dlink_list_length(&ptr->users))
                        {
                                if(last_ptr)
                                        last_ptr->hnext = next_ptr;