From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 23 Nov 2018 15:31:04 +0000 (+0100)
Subject: tree-wide: port over more cases to STR_IN_SET()
X-Git-Tag: v240~220^2~5
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=0cbd293e125ba1a5f23f2698da319d61a91c0dc1;p=systemd%2F.git

tree-wide: port over more cases to STR_IN_SET()
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 94ae37dcb0..4276db4099 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1852,9 +1852,7 @@ char *cg_escape(const char *p) {
          * needs free()! */
 
         if (IN_SET(p[0], 0, '_', '.') ||
-            streq(p, "notify_on_release") ||
-            streq(p, "release_agent") ||
-            streq(p, "tasks") ||
+            STR_IN_SET(p, "notify_on_release", "release_agent", "tasks") ||
             startswith(p, "cgroup."))
                 need_prefix = true;
         else {
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index a81e0e94c7..952f67a0d9 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1183,8 +1183,7 @@ static bool file_has_type_prefix(const char *prefix, const char *filename) {
         tilded = strjoina(full, "~");
         atted = strjoina(prefix, "@");
 
-        return streq(filename, full) ||
-               streq(filename, tilded) ||
+        return STR_IN_SET(filename, full, tilded) ||
                startswith(filename, atted);
 }