From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Jul 2016 18:26:24 +0000 (+0200)
Subject: bootctl: make use of STRV_FOREACH() where we can
X-Git-Tag: v232~368^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=181ccb43ead439059d4302252870a77ff4441688;p=thirdparty%2Fsystemd.git

bootctl: make use of STRV_FOREACH() where we can
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 8b2407f145f..d9c38973920 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -628,11 +628,11 @@ static const char *efi_subdirs[] = {
 };
 
 static int create_dirs(const char *esp_path) {
+        const char **i;
         int r;
-        unsigned i;
 
-        for (i = 0; i < ELEMENTSOF(efi_subdirs); i++) {
-                r = mkdir_one(esp_path, efi_subdirs[i]);
+        STRV_FOREACH(i, efi_subdirs) {
+                r = mkdir_one(esp_path, *i);
                 if (r < 0)
                         return r;
         }
@@ -836,7 +836,7 @@ static int install_variables(const char *esp_path,
                                        "Failed to access EFI variables. Is the \"efivarfs\" filesystem mounted?" :
                                        "Failed to determine current boot order: %m");
 
-        if (first || r == false) {
+        if (first || r == 0) {
                 r = efi_add_boot_option(slot, "Linux Boot Manager",
                                         part, pstart, psize,
                                         uuid, path);