diff options
Diffstat (limited to 'src/nspawn/nspawn-settings.c')
| -rw-r--r-- | src/nspawn/nspawn-settings.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index 48daaa83e1..e06de68072 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -727,11 +727,10 @@ int config_parse_oom_score_adjust( void *data, void *userdata) { - Settings *settings = data; + Settings *settings = ASSERT_PTR(data); int oa, r; assert(rvalue); - assert(settings); if (isempty(rvalue)) { settings->oom_score_adjust_set = false; @@ -766,10 +765,9 @@ int config_parse_cpu_affinity( void *data, void *userdata) { - Settings *settings = data; + Settings *settings = ASSERT_PTR(data); assert(rvalue); - assert(settings); return parse_cpu_set_extend(rvalue, &settings->cpu_set, true, unit, filename, line, lvalue); } @@ -844,11 +842,10 @@ int config_parse_link_journal( void *data, void *userdata) { - Settings *settings = data; + Settings *settings = ASSERT_PTR(data); int r; assert(rvalue); - assert(settings); r = parse_link_journal(rvalue, &settings->link_journal, &settings->link_journal_try); if (r < 0) @@ -893,11 +890,10 @@ int config_parse_userns_chown( void *data, void *userdata) { - UserNamespaceOwnership *ownership = data; + UserNamespaceOwnership *ownership = ASSERT_PTR(data); int r; assert(rvalue); - assert(ownership); /* Compatibility support for UserNamespaceChown=, whose job has been taken over by UserNamespaceOwnership= */ @@ -923,11 +919,10 @@ int config_parse_bind_user( void *data, void *userdata) { - char ***bind_user = data; + char ***bind_user = ASSERT_PTR(data); int r; assert(rvalue); - assert(bind_user); if (isempty(rvalue)) { *bind_user = strv_free(*bind_user); |