Use linear channel list comparisons

[solanum.git] / ircd / tgchange.c

diff --git a/ircd/tgchange.c b/ircd/tgchange.c
index b9f427bd5d65cdb8c645a0ba80a2f6cea007131b..c8e595aab8f0548b60ae9597f932dd647ca41eed 100644 (file)
--- a/ircd/tgchange.c
+++ b/ircd/tgchange.c
@@ -38,14 +38,29 @@ static int add_hashed_target(struct Client *source_p, uint32_t hashv);
 struct Channel *
 find_allowing_channel(struct Client *source_p, struct Client *target_p)
 {
-       rb_dlink_node *ptr;
-       struct membership *msptr;
+       rb_dlink_node *ps = source_p->user->channel.head;
+       rb_dlink_node *pt = target_p->user->channel.head;
 
-       RB_DLINK_FOREACH(ptr, source_p->user->channel.head)
+       while (ps && pt)
        {
-               msptr = ptr->data;
-               if (is_chanop_voiced(msptr) && IsMember(target_p, msptr->chptr))
-                       return msptr->chptr;
+               struct membership *ms = ps->data;
+               struct membership *mt = pt->data;
+               int d;
+               if (ms->chptr == mt->chptr)
+               {
+                       if (is_chanop_voiced(ms))
+                               return ms->chptr;
+                       ps = ps->next;
+                       pt = pt->next;
+                       continue;
+               }
+               d = irccmp(ms->chptr->chname, mt->chptr->chname);
+               if (d < 0)
+                       ps = ps->next;
+               else if (d > 0)
+                       pt = pt->next;
+               else
+                       assert("different channels can't have equal names" && false);
        }
        return NULL;
 }