diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-07 08:57:30 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-07 08:57:30 -0500 |
| commit | 46c3230dd0985062f06341809faa05e73fa1ccd1 (patch) | |
| tree | 3764366ad0757a4d45c595742de5dde1723fb2fb /src/core/namespace.c | |
| parent | 49fedb4094b69d279095ef8ce8d9203161aed5d9 (diff) | |
nspawn: slight simplification
Diffstat (limited to 'src/core/namespace.c')
| -rw-r--r-- | src/core/namespace.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c index c719dc13e7..f361e139ac 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -154,10 +154,10 @@ static const TargetMount protect_system_strict_table[] = { { "/root", READWRITE, true }, /* ProtectHome= */ }; -static void set_bind_mount(BindMount **p, char *path, MountMode mode, bool ignore) { - (*p)->path = path; - (*p)->mode = mode; - (*p)->ignore = ignore; +static void set_bind_mount(BindMount *p, char *path, MountMode mode, bool ignore) { + p->path = path; + p->mode = mode; + p->ignore = ignore; } static int append_one_mount(BindMount **p, const char *root_directory, @@ -169,9 +169,7 @@ static int append_one_mount(BindMount **p, const char *root_directory, if (!lpath) return -ENOMEM; - set_bind_mount(p, lpath, mode, ignore); - (*p)++; - + set_bind_mount((*p)++, lpath, mode, ignore); return 0; } @@ -196,8 +194,7 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) { if (!path) return -ENOMEM; - set_bind_mount(p, path, mode, ignore); - (*p)++; + set_bind_mount((*p)++, path, mode, ignore); } return 0; @@ -224,8 +221,7 @@ static int append_target_mounts(BindMount **p, const char *root_directory, const if (!path_is_absolute(path)) return -EINVAL; - set_bind_mount(p, path, m->mode, m->ignore); - (*p)++; + set_bind_mount((*p)++, path, m->mode, m->ignore); } return 0; |