From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 25 Nov 2016 17:59:06 +0000 (+0100)
Subject: nspawn: coding style: don't mix variable declarations and function calls
X-Git-Tag: v233~368^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4da92e58570a8a864eb031ae372fc4a611e7faf1;p=thirdparty%2Fsystemd.git

nspawn: coding style: don't mix variable declarations and function calls
---

diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index 9d76f4a3816..cbc5b93c2aa 100644
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -464,12 +464,14 @@ static int parse_mount_bind_options(const char *options, unsigned long *mount_fl
         const char *p = options;
         unsigned long flags = *mount_flags;
         char *opts = NULL;
+        int r;
 
         assert(options);
 
         for (;;) {
                 _cleanup_free_ char *word = NULL;
-                int r = extract_first_word(&p, &word, ",", 0);
+
+                r = extract_first_word(&p, &word, ",", 0);
                 if (r < 0)
                         return log_error_errno(r, "Failed to extract mount option: %m");
                 if (r == 0)