From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Oct 2018 12:41:14 +0000 (+0200)
Subject: env-util: use strv_contains() where appropriate
X-Git-Tag: v240~511^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68ac147e8db4e6cd4813037b682729ea98c4a707;p=thirdparty%2Fsystemd.git

env-util: use strv_contains() where appropriate
---

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 3b8130b03e4..c7c9a7dbe8d 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -125,30 +125,28 @@ bool strv_env_is_valid(char **e) {
 }
 
 bool strv_env_name_is_valid(char **l) {
-        char **p, **q;
+        char **p;
 
         STRV_FOREACH(p, l) {
                 if (!env_name_is_valid(*p))
                         return false;
 
-                STRV_FOREACH(q, p + 1)
-                        if (streq(*p, *q))
-                                return false;
+                if (strv_contains(p + 1, *p))
+                        return false;
         }
 
         return true;
 }
 
 bool strv_env_name_or_assignment_is_valid(char **l) {
-        char **p, **q;
+        char **p;
 
         STRV_FOREACH(p, l) {
                 if (!env_assignment_is_valid(*p) && !env_name_is_valid(*p))
                         return false;
 
-                STRV_FOREACH(q, p + 1)
-                        if (streq(*p, *q))
-                                return false;
+                if (strv_contains(p + 1, *p))
+                        return false;
         }
 
         return true;