From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Apr 2020 11:36:36 +0000 (+0200)
Subject: udev: use STR_IN_SET() wher eit makes sense
X-Git-Tag: v246-rc1~513^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9663ed378e2fd7ba96bf9e87ca8452161e79801c;p=thirdparty%2Fsystemd.git

udev: use STR_IN_SET() wher eit makes sense
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 3bf3ee56f38..4c955b0c079 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1330,11 +1330,7 @@ static bool token_match_string(UdevRuleToken *token, const char *str) {
                 match = isempty(str);
                 break;
         case MATCH_TYPE_SUBSYSTEM:
-                NULSTR_FOREACH(i, "subsystem\0class\0bus\0")
-                        if (streq(i, str)) {
-                                match = true;
-                                break;
-                        }
+                match = STR_IN_SET(str, "subsystem", "class", "bus");
                 break;
         case MATCH_TYPE_PLAIN_WITH_EMPTY:
                 if (isempty(str)) {