From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 2 Jun 2015 14:27:56 +0000 (+0200)
Subject: trigger: make trigger_match() bool and make return value less confusing
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=47462caa6346dd4c51ae4ba6061f124e94ecce7a;p=oweals%2Fprocd.git

trigger: make trigger_match() bool and make return value less confusing

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/service/trigger.c b/service/trigger.c
index a8533b3..97a06bb 100644
--- a/service/trigger.c
+++ b/service/trigger.c
@@ -323,12 +323,12 @@ void trigger_init(void)
 	q.max_running_tasks = 1;
 }
 
-static int trigger_match(const char *event, const char *match)
+static bool trigger_match(const char *event, const char *match)
 {
 	char *wildcard = strstr(match, ".*");
 	if (wildcard)
-		return strncmp(event, match, wildcard - match);
-	return strcmp(event, match);
+		return !strncmp(event, match, wildcard - match);
+	return !strcmp(event, match);
 }
 
 void trigger_event(const char *type, struct blob_attr *data)
@@ -338,7 +338,7 @@ void trigger_event(const char *type, struct blob_attr *data)
 	list_for_each_entry(t, &triggers, list) {
 		if (t->remove)
 			continue;
-		if (!trigger_match(type, t->type)) {
+		if (trigger_match(type, t->type)) {
 			if (t->timeout) {
 				free(t->data);
 				t->data = blob_memdup(data);