9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

m_names: use ITER_COMM_CHANNELS

Browse source
This commit is contained in:
Ed Kellett 2021-10-17 17:36:53 +01:00 committed by GitHub
parent 54f05581ab
commit 31db8f0094
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/m_names.c
View file

@ -120,10 +120,9 @@ static void
names_global(struct Client *source_p) names_global(struct Client *source_p)
{ {
bool dont_show = false; bool dont_show = false;
rb_dlink_node *lp, *ptr; rb_dlink_node *ptr;
struct Client *target_p; struct Client *target_p;
struct Channel *chptr = NULL; struct Channel *chptr = NULL;
struct membership *msptr;
/* first do all visible channels */ /* first do all visible channels */
RB_DLINK_FOREACH(ptr, global_channel_list.head) RB_DLINK_FOREACH(ptr, global_channel_list.head)
@ -141,6 +140,9 @@ names_global(struct Client *source_p)
/* Second, do all clients in one big sweep */ /* Second, do all clients in one big sweep */
RB_DLINK_FOREACH(ptr, global_client_list.head) RB_DLINK_FOREACH(ptr, global_client_list.head)
{ {
rb_dlink_node *ps, *pt;
struct membership *ms, *mt;
target_p = ptr->data; target_p = ptr->data;
dont_show = false; dont_show = false;
@ -154,13 +156,11 @@ names_global(struct Client *source_p)
* both were missed out above. if the target is on a * both were missed out above. if the target is on a
* common channel with source, its already been shown. * common channel with source, its already been shown.
*/ */
RB_DLINK_FOREACH(lp, target_p->user->channel.head) ITER_COMM_CHANNELS(ps, pt, source_p->user->channel.head, target_p->user->channel.head, ms, mt, chptr)
{ {
msptr = lp->data; if (!mt) continue;
chptr = msptr->chptr;
if(PubChannel(chptr) || IsMember(source_p, chptr) || if (PubChannel(chptr) || SecretChannel(chptr) || ms)
SecretChannel(chptr))
{ {
dont_show = true; dont_show = true;
break; break;