X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/c98390004f4f14cd8215302d77313f81e2546e22..90a3c35b295b07ebe3793bf5d3b882c3c1a5dc7c:/modules/core/m_nick.c?ds=sidebyside

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index ea91da2..b8b6771 100644
--- 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);
@@ -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->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, *next_ptr;
 	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, next_ptr, 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->fd, "Nick: %s", nick);
+	rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+	rb_note(client_p->localClient->F, note);
 
 	return;
 }
@@ -890,7 +892,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);
@@ -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;
@@ -1225,7 +1227,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 +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)