From: Harald Hoyer <harald@redhat.com>
Date: Mon, 15 Mar 2021 11:13:26 +0000 (+0100)
Subject: style(install): use block for the FOREACH macros
X-Git-Tag: 054~296
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0850cf532d2449efc3c0920183a57466873e7208;p=thirdparty%2Fdracut.git

style(install): use block for the FOREACH macros
---

diff --git a/install/hashmap.c b/install/hashmap.c
index bc1196953..6324096c0 100644
--- a/install/hashmap.c
+++ b/install/hashmap.c
@@ -649,8 +649,9 @@ char **hashmap_get_strv(Hashmap * h)
                 return NULL;
 
         n = 0;
-        HASHMAP_FOREACH(item, h, it)
-            sv[n++] = item;
+        HASHMAP_FOREACH(item, h, it) {
+                sv[n++] = item;
+        }
         sv[n] = NULL;
 
         return sv;
diff --git a/install/strv.c b/install/strv.c
index 484c58721..a8473e442 100644
--- a/install/strv.c
+++ b/install/strv.c
@@ -32,9 +32,10 @@ char *strv_find(char **l, const char *name)
 
         assert(name);
 
-        STRV_FOREACH(i, l)
-            if (streq(*i, name))
-                return *i;
+        STRV_FOREACH(i, l) {
+                if (streq(*i, name))
+                        return *i;
+        }
 
         return NULL;
 }
@@ -45,9 +46,10 @@ char *strv_find_prefix(char **l, const char *name)
 
         assert(name);
 
-        STRV_FOREACH(i, l)
-            if (startswith(*i, name))
-                return *i;
+        STRV_FOREACH(i, l) {
+                if (startswith(*i, name))
+                        return *i;
+        }
 
         return NULL;
 }
@@ -252,8 +254,9 @@ char **strv_split(const char *s, const char *separator)
         assert(s);
 
         n = 0;
-        FOREACH_WORD_SEPARATOR(w, l, s, separator, state)
-            n++;
+        FOREACH_WORD_SEPARATOR(w, l, s, separator, state) {
+                n++;
+        }
 
         r = new(char *, n + 1);
         if (!r)
@@ -285,8 +288,9 @@ char **strv_split_quoted(const char *s)
         assert(s);
 
         n = 0;
-        FOREACH_WORD_QUOTED(w, l, s, state)
-            n++;
+        FOREACH_WORD_QUOTED(w, l, s, state) {
+                n++;
+        }
 
         r = new(char *, n + 1);
         if (!r)
@@ -445,9 +449,9 @@ char **strv_uniq(char **l)
         /* Drops duplicate entries. The first identical string will be
          * kept, the others dropped */
 
-        STRV_FOREACH(i, l)
-            strv_remove(i + 1, *i);
-
+        STRV_FOREACH(i, l) {
+                strv_remove(i + 1, *i);
+        }
         return l;
 }
 
@@ -555,10 +559,11 @@ char **strv_split_nulstr(const char *s)
         const char *i;
         char **r = NULL;
 
-        NULSTR_FOREACH(i, s)
-            if (strv_extend(&r, i) < 0) {
-                strv_free(r);
-                return NULL;
+        NULSTR_FOREACH(i, s) {
+                if (strv_extend(&r, i) < 0) {
+                        strv_free(r);
+                        return NULL;
+                }
         }
 
         if (!r)
@@ -605,6 +610,7 @@ void strv_print(char **l)
         if (!l)
                 return;
 
-        STRV_FOREACH(s, l)
-            puts(*s);
+        STRV_FOREACH(s, l) {
+                puts(*s);
+        }
 }