mirror of
https://github.com/matrix-construct/construct
synced 2024-11-29 18:22:50 +01:00
Automated merge with ssh://hg.atheme.org//hg/charybdis
This commit is contained in:
commit
03dba44854
7 changed files with 11 additions and 11 deletions
|
@ -54,7 +54,7 @@ extern rb_dlink_list resv_conf_list;
|
|||
extern rb_dlink_list nd_list;
|
||||
extern rb_dlink_list tgchange_list;
|
||||
|
||||
struct _patricia_tree_t *tgchange_tree;
|
||||
struct _rb_patricia_tree_t *tgchange_tree;
|
||||
|
||||
extern void init_s_newconf(void);
|
||||
extern void clear_s_newconf(void);
|
||||
|
|
|
@ -208,8 +208,8 @@ build_nicklist(struct Client *source_p, char *addbuf, char *delbuf, const char *
|
|||
static void
|
||||
add_accept(struct Client *source_p, struct Client *target_p)
|
||||
{
|
||||
dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
|
||||
dlinkAddAlloc(source_p, &target_p->on_allow_list);
|
||||
rb_dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
|
||||
rb_dlinkAddAlloc(source_p, &target_p->on_allow_list);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -681,7 +681,7 @@ majority_gline(struct Client *source_p, const char *user,
|
|||
pending->last_gline_time = CurrentTime;
|
||||
pending->time_request1 = CurrentTime;
|
||||
|
||||
dlinkAddAlloc(pending, &pending_glines);
|
||||
rb_dlinkAddAlloc(pending, &pending_glines);
|
||||
|
||||
return NO;
|
||||
}
|
||||
|
|
|
@ -214,10 +214,10 @@ add_invite(struct Channel *chptr, struct Client *who)
|
|||
}
|
||||
|
||||
/* add user to channel invite list */
|
||||
dlinkAddAlloc(who, &chptr->invites);
|
||||
rb_dlinkAddAlloc(who, &chptr->invites);
|
||||
|
||||
/* add channel to user invite list */
|
||||
dlinkAddAlloc(chptr, &who->user->invited);
|
||||
rb_dlinkAddAlloc(chptr, &who->user->invited);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -103,11 +103,11 @@ add_monitor(struct Client *client_p, const char *nicks)
|
|||
monptr = find_monitor(name, 1);
|
||||
|
||||
/* already monitoring this nick */
|
||||
if(dlinkFind(client_p, &monptr->users))
|
||||
if(rb_dlinkFind(client_p, &monptr->users))
|
||||
continue;
|
||||
|
||||
dlinkAddAlloc(client_p, &monptr->users);
|
||||
dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
|
||||
rb_dlinkAddAlloc(client_p, &monptr->users);
|
||||
rb_dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
|
||||
|
||||
if((target_p = find_named_person(name)) != NULL)
|
||||
{
|
||||
|
|
|
@ -284,7 +284,7 @@ parse_resv(struct Client *source_p, const char *name,
|
|||
aconf->port = 0;
|
||||
DupString(aconf->name, name);
|
||||
DupString(aconf->passwd, reason);
|
||||
dlinkAddAlloc(aconf, &resv_conf_list);
|
||||
rb_dlinkAddAlloc(aconf, &resv_conf_list);
|
||||
|
||||
if(temp_time > 0)
|
||||
{
|
||||
|
|
|
@ -60,7 +60,7 @@ rb_dlink_list resv_conf_list; /* nicks only! */
|
|||
rb_dlink_list nd_list; /* nick delay */
|
||||
rb_dlink_list tgchange_list;
|
||||
|
||||
patricia_tree_t *tgchange_tree;
|
||||
rb_patricia_tree_t *tgchange_tree;
|
||||
|
||||
static BlockHeap *nd_heap = NULL;
|
||||
|
||||
|
|
Loading…
Reference in a new issue