Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/src/client.c b/src/client.c
index 0e6cef59f69f76814edfd094e63a30507fe30157..c4ade72a543dd77d6ea5565f75179ae59fde9941 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -27,11 +27,9 @@
 #include "stdinc.h"
 #include "config.h"
 
-#include "tools.h"
 #include "client.h"
 #include "class.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -40,7 +38,6 @@
 #include "numeric.h"
 #include "packet.h"
 #include "s_auth.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -49,11 +46,8 @@
 #include "send.h"
 #include "whowas.h"
 #include "s_user.h"
-#include "linebuf.h"
 #include "hash.h"
-#include "memory.h"
 #include "hostmask.h"
-#include "balloc.h"
 #include "listener.h"
 #include "hook.h"
 #include "msg.h"
@@ -229,13 +223,13 @@ free_local_client(struct Client *client_p)
        {
                memset(client_p->localClient->passwd, 0,
                        strlen(client_p->localClient->passwd));
-               MyFree(client_p->localClient->passwd);
+               rb_free(client_p->localClient->passwd);
        }
 
-       MyFree(client_p->localClient->challenge);
-       MyFree(client_p->localClient->fullcaps);
-       MyFree(client_p->localClient->opername);
-       MyFree(client_p->localClient->mangledhost);
+       rb_free(client_p->localClient->challenge);
+       rb_free(client_p->localClient->fullcaps);
+       rb_free(client_p->localClient->opername);
+       rb_free(client_p->localClient->mangledhost);
 
        BlockHeapFree(lclient_heap, client_p->localClient);
        client_p->localClient = NULL;
@@ -797,8 +791,8 @@ release_client_state(struct Client *client_p)
                if(client_p->serv->user != NULL)
                        free_user(client_p->serv->user, client_p);
                if(client_p->serv->fullcaps)
-                       MyFree(client_p->serv->fullcaps);
-               MyFree(client_p->serv);
+                       rb_free(client_p->serv->fullcaps);
+               rb_free(client_p->serv);
        }
 }
 
@@ -1289,7 +1283,7 @@ exit_aborted_clients(void *unused)
                 */
                abt->client->flags &= ~FLAGS_CLOSING;
                exit_client(abt->client, abt->client, &me, abt->notice);
-               MyFree(abt);
+               rb_free(abt);
        }
 }
 
@@ -1915,7 +1909,7 @@ free_user(struct User *user, struct Client *client_p)
        if(--user->refcnt <= 0)
        {
                if(user->away)
-                       MyFree((char *) user->away);
+                       rb_free((char *) user->away);
                /*
                 * sanity check
                 */
@@ -2072,9 +2066,9 @@ close_connection(struct Client *client_p)
        {
                /* attempt to flush any pending dbufs. Evil, but .. -- adrian */
                if(!IsIOError(client_p))
-                       send_queued_write(client_p->localClient->F->fd, client_p);
+                       send_queued(client_p);
 
-               rb_close(client_p->localClient->F->fd);
+               rb_close(client_p->localClient->F);
                client_p->localClient->F = NULL;
        }
 
@@ -2084,8 +2078,8 @@ close_connection(struct Client *client_p)
                client_p->localClient->ctrlfd = -1;
        }
 
-       linebuf_donebuf(&client_p->localClient->buf_sendq);
-       linebuf_donebuf(&client_p->localClient->buf_recvq);
+       rb_linebuf_donebuf(&client_p->localClient->buf_sendq);
+       rb_linebuf_donebuf(&client_p->localClient->buf_recvq);
        detach_conf(client_p);
 
        /* XXX shouldnt really be done here. */
@@ -2111,7 +2105,7 @@ error_exit_client(struct Client *client_p, int error)
         * for reading even though it ends up being an EOF. -avalon
         */
        char errmsg[255];
-       int current_error = rb_get_sockerr(client_p->localClient->F->fd);
+       int current_error = rb_get_sockerr(client_p->localClient->F);
 
        SetIOError(client_p);