From 9f6c335332cb357b4bf5f991387087f907f6e55c Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Tue, 1 Apr 2008 22:54:08 +0200 Subject: [PATCH] Change over some dlink functions. --- modules/core/m_nick.c | 4 ++-- modules/m_accept.c | 4 ++-- modules/m_dline.c | 2 +- modules/m_gline.c | 2 +- modules/m_kline.c | 2 +- modules/m_list.c | 2 +- modules/m_monitor.c | 4 ++-- modules/m_rehash.c | 14 +++++++------- modules/m_resv.c | 2 +- modules/m_xline.c | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c index b638cf3..f11bbdb 100644 --- a/modules/core/m_nick.c +++ b/modules/core/m_nick.c @@ -845,8 +845,8 @@ 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 */ diff --git a/modules/m_accept.c b/modules/m_accept.c index a26de88..8b86a4c 100644 --- a/modules/m_accept.c +++ b/modules/m_accept.c @@ -95,8 +95,8 @@ m_accept(struct Client *client_p, struct Client *source_p, int parc, const char continue; } - dlinkFindDestroy(target_p, &source_p->localClient->allow_list); - dlinkFindDestroy(source_p, &target_p->on_allow_list); + rb_dlinkFindDestroy(target_p, &source_p->localClient->allow_list); + rb_dlinkFindDestroy(source_p, &target_p->on_allow_list); } /* get the number of accepts they have */ diff --git a/modules/m_dline.c b/modules/m_dline.c index 0f478a5..37fffde 100644 --- a/modules/m_dline.c +++ b/modules/m_dline.c @@ -460,7 +460,7 @@ remove_temp_dline(struct ConfItem *aconf) { if (aconf == ptr->data) { - dlinkDestroy(ptr, &temp_dlines[i]); + rb_dlinkDestroy(ptr, &temp_dlines[i]); delete_one_address_conf(aconf->host, aconf); return YES; } diff --git a/modules/m_gline.c b/modules/m_gline.c index 22cf9cc..9908c57 100644 --- a/modules/m_gline.c +++ b/modules/m_gline.c @@ -722,7 +722,7 @@ remove_temp_gline(const char *user, const char *host) (struct sockaddr *)&caddr, bits)) continue; - dlinkDestroy(ptr, &glines); + rb_dlinkDestroy(ptr, &glines); remove_reject_mask(aconf->user, aconf->host); delete_one_address_conf(aconf->host, aconf); return YES; diff --git a/modules/m_kline.c b/modules/m_kline.c index 0a39dab..e557cb6 100644 --- a/modules/m_kline.c +++ b/modules/m_kline.c @@ -931,7 +931,7 @@ remove_temp_kline(struct Client *source_p, struct ConfItem *aconf) ilog(L_KLINE, "UK %s %s %s", get_oper_name(source_p), aconf->user, aconf->host); - dlinkDestroy(ptr, &temp_klines[i]); + rb_dlinkDestroy(ptr, &temp_klines[i]); remove_reject_mask(aconf->user, aconf->host); delete_one_address_conf(aconf->host, aconf); return YES; diff --git a/modules/m_list.c b/modules/m_list.c index 9c16161..933c571 100644 --- a/modules/m_list.c +++ b/modules/m_list.c @@ -281,7 +281,7 @@ static void safelist_client_release(struct Client *client_p) { s_assert(MyClient(client_p)); - dlinkFindDestroy(client_p, &safelisting_clients); + rb_dlinkFindDestroy(client_p, &safelisting_clients); MyFree(client_p->localClient->safelist_data); diff --git a/modules/m_monitor.c b/modules/m_monitor.c index 23e203e..ef0f6ba 100644 --- a/modules/m_monitor.c +++ b/modules/m_monitor.c @@ -180,8 +180,8 @@ del_monitor(struct Client *client_p, const char *nicks) if((monptr = find_monitor(name, 0)) == NULL) continue; - dlinkFindDestroy(client_p, &monptr->users); - dlinkFindDestroy(monptr, &client_p->localClient->monitor_list); + rb_dlinkFindDestroy(client_p, &monptr->users); + rb_dlinkFindDestroy(monptr, &client_p->localClient->monitor_list); } } diff --git a/modules/m_rehash.c b/modules/m_rehash.c index 1a88201..b117b1c 100644 --- a/modules/m_rehash.c +++ b/modules/m_rehash.c @@ -118,7 +118,7 @@ rehash_glines(struct Client *source_p) aconf = ptr->data; delete_one_address_conf(aconf->host, aconf); - dlinkDestroy(ptr, &glines); + rb_dlinkDestroy(ptr, &glines); } } @@ -139,7 +139,7 @@ rehash_pglines(struct Client *source_p) MyFree(glp_ptr->reason1); MyFree(glp_ptr->reason2); MyFree(glp_ptr); - dlinkDestroy(ptr, &pending_glines); + rb_dlinkDestroy(ptr, &pending_glines); } } @@ -160,7 +160,7 @@ rehash_tklines(struct Client *source_p) aconf = ptr->data; delete_one_address_conf(aconf->host, aconf); - dlinkDestroy(ptr, &temp_klines[i]); + rb_dlinkDestroy(ptr, &temp_klines[i]); } } } @@ -182,7 +182,7 @@ rehash_tdlines(struct Client *source_p) aconf = ptr->data; delete_one_address_conf(aconf->host, aconf); - dlinkDestroy(ptr, &temp_dlines[i]); + rb_dlinkDestroy(ptr, &temp_dlines[i]); } } } @@ -205,7 +205,7 @@ rehash_txlines(struct Client *source_p) continue; free_conf(aconf); - dlinkDestroy(ptr, &xline_conf_list); + rb_dlinkDestroy(ptr, &xline_conf_list); } } @@ -228,7 +228,7 @@ rehash_tresvs(struct Client *source_p) continue; free_conf(aconf); - dlinkDestroy(ptr, &resvTable[i]); + rb_dlinkDestroy(ptr, &resvTable[i]); } HASH_WALK_END @@ -240,7 +240,7 @@ rehash_tresvs(struct Client *source_p) continue; free_conf(aconf); - dlinkDestroy(ptr, &resv_conf_list); + rb_dlinkDestroy(ptr, &resv_conf_list); } } diff --git a/modules/m_resv.c b/modules/m_resv.c index 50b7faf..d1e11fc 100644 --- a/modules/m_resv.c +++ b/modules/m_resv.c @@ -516,7 +516,7 @@ remove_resv(struct Client *source_p, const char *name) ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name); } /* already have ptr from the loop above.. */ - dlinkDestroy(ptr, &resv_conf_list); + rb_dlinkDestroy(ptr, &resv_conf_list); } free_conf(aconf); diff --git a/modules/m_xline.c b/modules/m_xline.c index 32ddeba..9b257ff 100644 --- a/modules/m_xline.c +++ b/modules/m_xline.c @@ -561,7 +561,7 @@ remove_xline(struct Client *source_p, const char *name) remove_reject_mask(aconf->name, NULL); free_conf(aconf); - dlinkDestroy(ptr, &xline_conf_list); + rb_dlinkDestroy(ptr, &xline_conf_list); return; } }