ircs[n]printf -> rb_s[n]printf

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

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index ea91da28c18ccf131b6a19f238640b48dfc7e960..b638cf30c905c1767c50dcab091f0be7306d0e90 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -156,7 +156,7 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
                return 0;
        }
 
-       if(hash_find_nd(nick))
+       if(irc_dictionary_find(nd_dict, nick))
        {
                sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
                           me.name, EmptyString(source_p->name) ? "*" : source_p->name, nick);
@@ -217,7 +217,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
                return 0;
        }
 
-       if(hash_find_nd(nick))
+       if(irc_dictionary_find(nd_dict, nick))
        {
                sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
                           me.name, EmptyString(source_p->name) ? "*" : source_p->name, nick);
@@ -741,7 +741,7 @@ set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
        add_to_client_hash(nick, source_p);
 
        /* fd_desc is long enough */
-       comm_note(client_p->localClient->fd, "Nick: %s", nick);
+       rb_note(client_p->localClient->F->fd, "Nick: %s", nick);
 
        if(source_p->flags & FLAGS_SENTUSER)
        {
@@ -758,7 +758,7 @@ 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, *next_ptr;
        struct Channel *chptr;
        int samenick;
 
@@ -841,7 +841,7 @@ 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, next_ptr, source_p->on_allow_list.head)
        {
                target_p = ptr->data;
 
@@ -850,7 +850,7 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
        }
 
        /* fd_desc is long enough */
-       comm_note(client_p->localClient->fd, "Nick: %s", nick);
+       rb_note(client_p->localClient->F->fd, "Nick: %s", nick);
 
        return;
 }
@@ -890,7 +890,7 @@ change_remote_nick(struct Client *client_p, struct Client *source_p,
        del_from_client_hash(source_p->name, source_p);
 
        /* invalidate nick delay when a remote client uses the nick.. */
-       if((nd = hash_find_nd(nick)))
+       if((nd = irc_dictionary_retrieve(nd_dict, nick)))
                free_nd_entry(nd);
 
        strcpy(source_p->name, nick);
@@ -1225,7 +1225,7 @@ register_client(struct Client *client_p, struct Client *server,
        }
 
        /* remove any nd entries for this nick */
-       if((nd = hash_find_nd(nick)))
+       if((nd = irc_dictionary_retrieve(nd_dict, nick)))
                free_nd_entry(nd);
 
        add_to_client_hash(nick, source_p);
@@ -1240,9 +1240,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))
                                {