projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5639193
)
nspawn: coding style: don't mix variable declarations and function calls
author
Lennart Poettering
<lennart@poettering.net>
Fri, 25 Nov 2016 17:59:06 +0000
(18:59 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 30 Nov 2016 23:25:51 +0000
(
00:25
+0100)
src/nspawn/nspawn-mount.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn-mount.c
b/src/nspawn/nspawn-mount.c
index
9d76f4a
..
cbc5b93
100644
(file)
--- 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)