X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-rules.c;h=77029f7bec024e2ec9d90164520816b202cc59e4;hb=11ae7578505caa8df5604c6c86c82e9558439b30;hp=a6f9220352de5fc6caa1542019ee7da81f487253;hpb=1822e9b033fcd91a7dfd3b0bfd12cfbbd93fc470;p=elogind.git

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index a6f922035..77029f7be 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1808,11 +1808,10 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct
 		const char *val;
 
 		val = udev_device_get_sysattr_value(dev, key_name);
-		if (val != NULL)
-			util_strlcpy(value, val, sizeof(value));
+		if (val == NULL)
+			return -1;
+		util_strlcpy(value, val, sizeof(value));
 	}
-	if (value[0] == '\0')
-		return -1;
 
 	/* strip trailing whitespace of value, if not asked to match for it */
 	len = strlen(key_value);
@@ -1843,7 +1842,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 	/* loop through token list, match, run actions or forward to next rule */
 	cur = &rules->tokens[0];
 	rule = cur;
-	while (cur != NULL && cur->type != TK_END) {
+	while (1) {
 		unsigned int idx;
 
 		dump_token(rules, cur);
@@ -2319,11 +2318,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			cur = &rules->tokens[cur->key.rule_goto];
 			continue;
 		case TK_A_LAST_RULE:
-			break;
+		case TK_END:
+			return 0;
 
 		case TK_M_PARENTS_MAX:
 		case TK_M_MAX:
-		case TK_END:
 		case TK_UNSET:
 			err(rules->udev, "wrong type %u\n", cur->type);
 			goto nomatch;
@@ -2335,9 +2334,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 		/* fast-forward to next rule */
 		idx = rule->rule.next_rule;
 		if (idx == 0)
-			break;
+			return 0;
 		dbg(rules->udev, "forward to rule: %u\n", idx);
 		cur = &rules->tokens[idx];
 	}
-	return 0;
 }