branch merge
This commit is contained in:
commit
5b4e901644
2 changed files with 2 additions and 2 deletions
|
@ -567,7 +567,7 @@ rb_bh_gc(rb_bh * bh)
|
||||||
offset = (uintptr_t)b->elems;
|
offset = (uintptr_t)b->elems;
|
||||||
for (i = 0; i < bh->elemsPerBlock; i++, offset += (uintptr_t)bh->elemSize)
|
for (i = 0; i < bh->elemsPerBlock; i++, offset += (uintptr_t)bh->elemSize)
|
||||||
{
|
{
|
||||||
rb_dlinkDelete(((rb_dlink_node *)(offset + offset_pad)), &bh->free_list);
|
rb_dlinkDelete(((rb_dlink_node *)offset), &bh->free_list);
|
||||||
}
|
}
|
||||||
rb_dlinkDelete(&b->node, &bh->block_list);
|
rb_dlinkDelete(&b->node, &bh->block_list);
|
||||||
free_block(b->elems, b->alloc_size);
|
free_block(b->elems, b->alloc_size);
|
||||||
|
|
|
@ -324,7 +324,7 @@ static void safelist_channel_named(struct Client *source_p, const char *name)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ShowChannel(source_p, chptr))
|
if (!SecretChannel(chptr) || IsMember(source_p, chptr))
|
||||||
sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name, chptr->chname,
|
sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name, chptr->chname,
|
||||||
rb_dlink_list_length(&chptr->members),
|
rb_dlink_list_length(&chptr->members),
|
||||||
chptr->topic == NULL ? "" : chptr->topic);
|
chptr->topic == NULL ? "" : chptr->topic);
|
||||||
|
|
Loading…
Reference in a new issue