MyFree -> rb_free

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

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index a624d4b3d60f485fb6b0e5dd5d116154d286fdde..27c9f9be11a2c6b2dee6e111f51aa96e386dcbd7 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -731,6 +731,7 @@ static void
 set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
 {
        char buf[USERLEN + 1];
+       char note[NICKLEN + 10];
 
        /* This had to be copied here to avoid problems.. */
        source_p->tsinfo = CurrentTime;
@@ -740,8 +741,8 @@ set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
        strcpy(source_p->name, nick);
        add_to_client_hash(nick, source_p);
 
-       /* fd_desc is long enough */
-       comm_note(client_p->localClient->F->fd, "Nick: %s", nick);
+       rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+       rb_note(client_p->localClient->F, note);
 
        if(source_p->flags & FLAGS_SENTUSER)
        {
@@ -758,8 +759,9 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
                char *nick, int dosend)
 {
        struct Client *target_p;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *rb_free(;
        struct Channel *chptr;
+       char note[NICKLEN + 10];
        int samenick;
 
        if (dosend)
@@ -841,16 +843,16 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
         * to clear a clients own list of accepted clients.  So just remove
         * them from everyone elses list --anfl
         */
-       DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->on_allow_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, source_p->on_allow_list.head)
        {
                target_p = ptr->data;
 
-               dlinkFindDestroy(source_p, &target_p->localClient->allow_list);
-               dlinkDestroy(ptr, &source_p->on_allow_list);
+               rb_dlinkFindDestroy(source_p, &target_p->localClient->allow_list);
+               rb_dlinkDestroy(ptr, &source_p->on_allow_list);
        }
 
-       /* fd_desc is long enough */
-       comm_note(client_p->localClient->F->fd, "Nick: %s", nick);
+       rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+       rb_note(client_p->localClient->F, note);
 
        return;
 }
@@ -1187,7 +1189,7 @@ register_client(struct Client *client_p, struct Client *server,
 
        source_p = make_client(client_p);
        user = make_user(source_p);
-       dlinkAddTail(source_p, &source_p->node, &global_client_list);
+       rb_dlinkAddTail(source_p, &source_p->node, &global_client_list);
 
        source_p->hopcount = atoi(parv[2]);
        source_p->tsinfo = newts;
@@ -1240,9 +1242,9 @@ register_client(struct Client *client_p, struct Client *server,
                if(flag & UMODE_SERVICE)
                {
                        int hit = 0;
-                       dlink_node *ptr;
+                       rb_dlink_node *ptr;
 
-                       DLINK_FOREACH(ptr, service_list.head)
+                       RB_DLINK_FOREACH(ptr, service_list.head)
                        {
                                if(!irccmp((const char *) ptr->data, server->name))
                                {
@@ -1271,7 +1273,7 @@ register_client(struct Client *client_p, struct Client *server,
        }
 
        if(IsOper(source_p) && !IsService(source_p))
-               dlinkAddAlloc(source_p, &oper_list);
+               rb_dlinkAddAlloc(source_p, &oper_list);
 
        SetRemoteClient(source_p);
 
@@ -1280,7 +1282,7 @@ register_client(struct Client *client_p, struct Client *server,
 
        source_p->servptr = server;
 
-       dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
+       rb_dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
 
        /* fake direction */
        if(source_p->servptr->from != source_p->from)