From ebb5967a19ee6abdd70a965ff8ca127df47f136f Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 13 Nov 2012 20:28:53 +0000 Subject: - changed match() polarity. match() now returns 0 on match and 1 on non-match This cleans up several places where function pointers of different matching functions like irccmp/strcmp/match are passed to other functions. - added improved collapse() to match.c git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1652 82007160-df01-0410-b94d-b575c5fd34c7 --- contrib/m_ctrace.c | 2 +- contrib/m_ltrace.c | 8 ++++---- contrib/m_operspy.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'contrib') diff --git a/contrib/m_ctrace.c b/contrib/m_ctrace.c index 13e0b0a..7b4d658 100644 --- a/contrib/m_ctrace.c +++ b/contrib/m_ctrace.c @@ -80,7 +80,7 @@ do_ctrace(struct Client *source_p, int parc, char *parv[]) struct Client *target_p = ptr->data; class_name = get_client_class(&target_p->localClient->confs); - if ((class_name != NULL) && match(class_looking_for, class_name)) + if ((class_name != NULL) && !match(class_looking_for, class_name)) report_this_status(source_p, target_p); } diff --git a/contrib/m_ltrace.c b/contrib/m_ltrace.c index 25f0716..afdf2f5 100644 --- a/contrib/m_ltrace.c +++ b/contrib/m_ltrace.c @@ -98,7 +98,7 @@ do_ltrace(struct Client *source_p, int parc, char *parv[]) { ac2ptr = ptr->data; - if (match(tname, ac2ptr->name)) + if (!match(tname, ac2ptr->name)) break; else ac2ptr = NULL; @@ -123,7 +123,7 @@ do_ltrace(struct Client *source_p, int parc, char *parv[]) source_p->name, source_p->username, source_p->host, source_p->servptr->name); - doall = (parv[1] && (parc > 1)) ? match(tname, me.name) : 1; + doall = (parv[1] && (parc > 1)) ? !match(tname, me.name) : 1; wilds = !parv[1] || strchr(tname, '*') || strchr(tname, '?'); dow = wilds || doall; @@ -170,7 +170,7 @@ do_ltrace(struct Client *source_p, int parc, char *parv[]) if (!HasUMode(target_p, UMODE_OPER)) continue; - if (!doall && wilds && !match(tname, target_p->name)) + if (!doall && wilds && match(tname, target_p->name)) continue; if (!dow && irccmp(tname, target_p->name)) @@ -184,7 +184,7 @@ do_ltrace(struct Client *source_p, int parc, char *parv[]) { target_p = ptr->data; - if (!doall && wilds && !match(tname, target_p->name)) + if (!doall && wilds && match(tname, target_p->name)) continue; if (!dow && irccmp(tname, target_p->name)) continue; diff --git a/contrib/m_operspy.c b/contrib/m_operspy.c index 59356be..1d2d050 100644 --- a/contrib/m_operspy.c +++ b/contrib/m_operspy.c @@ -520,10 +520,10 @@ who_global(struct Client *source_p, char *mask, int server_oper) continue; if (!mask || - match(mask, target_p->name) || match(mask, target_p->username) || - match(mask, target_p->host) || match(mask, target_p->servptr->name) || - match(mask, target_p->info) || - (MyClient(target_p) && match(mask, target_p->sockhost))) + !match(mask, target_p->name) || !match(mask, target_p->username) || + !match(mask, target_p->host) || !match(mask, target_p->servptr->name) || + !match(mask, target_p->info) || + (MyClient(target_p) && !match(mask, target_p->sockhost))) { if (dlink_list_length(&target_p->channel)) { -- cgit