From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Mar 2013 03:42:26 +0000 (+0100)
Subject: main: use strv_find() where we can
X-Git-Tag: v199~88
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=db813c2a9199d694f8e97618889425a2401524d6;hp=e2b1eb2661e95c8e3d03c5f7183a234fea990b68

main: use strv_find() where we can
---

diff --git a/src/core/main.c b/src/core/main.c
index 21c0d274c..05f0803b8 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1310,19 +1310,13 @@ int main(int argc, char *argv[]) {
         /* Determine if this is a reexecution or normal bootup. We do
          * the full command line parsing much later, so let's just
          * have a quick peek here. */
-        for (j = 1; j < argc; j++)
-                if (streq(argv[j], "--deserialize")) {
-                        skip_setup = true;
-                        break;
-                }
+        if (strv_find(argv+1, "--deserialize"))
+                skip_setup = true;
 
         /* If we have switched root, do all the special setup
          * things */
-        for (j = 1; j < argc; j++)
-                if (streq(argv[j], "--switched-root")) {
-                        skip_setup = false;
-                        break;
-                }
+        if (strv_find(argv+1, "--switched-root"))
+                skip_setup = false;
 
         /* If we get started via the /sbin/init symlink then we are
            called 'init'. After a subsequent reexecution we are then