report_error() cleanup

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

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index b638cf30c905c1767c50dcab091f0be7306d0e90..02c278789804957aea38e2e8eaf598b677f18394 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -731,17 +731,18 @@ 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;
+       source_p->tsinfo = rb_current_time();
        if(source_p->name[0])
                del_from_client_hash(source_p->name, source_p);
 
        strcpy(source_p->name, nick);
        add_to_client_hash(nick, source_p);
 
-       /* fd_desc is long enough */
-       rb_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)
        {
@@ -760,6 +761,7 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
        struct Client *target_p;
        rb_dlink_node *ptr, *next_ptr;
        struct Channel *chptr;
+       char note[NICKLEN + 10];
        int samenick;
 
        if (dosend)
@@ -772,10 +774,10 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
                                        nick, chptr->chname);
                        return;
                }
-               if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < CurrentTime)
+               if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < rb_current_time())
                        source_p->localClient->number_of_nick_changes = 0;
 
-               source_p->localClient->last_nick_change = CurrentTime;
+               source_p->localClient->last_nick_change = rb_current_time();
                source_p->localClient->number_of_nick_changes++;
 
                if(ConfigFileEntry.anti_nick_flood && !IsOper(source_p) &&
@@ -794,10 +796,10 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
        if(!samenick)
        {
                /* force the TS to increase -- jilles */
-               if (source_p->tsinfo >= CurrentTime)
+               if (source_p->tsinfo >= rb_current_time())
                        source_p->tsinfo++;
                else
-                       source_p->tsinfo = CurrentTime;
+                       source_p->tsinfo = rb_current_time();
                monitor_signoff(source_p);
                /* we only do bancache for local users -- jilles */
                if(source_p->user)
@@ -845,12 +847,12 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
        {
                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 */
-       rb_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;
 }
@@ -868,7 +870,7 @@ change_remote_nick(struct Client *client_p, struct Client *source_p,
        /* client changing their nick - dont reset ts if its same */
        if(!samenick)
        {
-               source_p->tsinfo = newts ? newts : CurrentTime;
+               source_p->tsinfo = newts ? newts : rb_current_time();
                monitor_signoff(source_p);
        }
 
@@ -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;
@@ -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)