summaryrefslogtreecommitdiff
path: root/src/sysv-generator
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-05-26 14:47:05 +0200
committerLennart Poettering <lennart@poettering.net>2020-05-26 23:52:26 +0200
commit470ab28d07cdb2bb650e3bd2bb43aa5b9ac28b86 (patch)
tree73df913c50395d1d3ad4d1b902c457c22195f4d3 /src/sysv-generator
parentc8aa4b5b867a246acdffb1b11321647a487f27da (diff)
downloadsystemd-470ab28d07cdb2bb650e3bd2bb43aa5b9ac28b86.tar.gz
sysv: use structured initialization
Diffstat (limited to 'src/sysv-generator')
-rw-r--r--src/sysv-generator/sysv-generator.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 5df5743823..a667a8ebad 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -788,19 +788,21 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
if (!fpath)
return log_oom();
- service = new0(SysvStub, 1);
+ service = new(SysvStub, 1);
if (!service)
return log_oom();
- service->sysv_start_priority = -1;
- service->name = TAKE_PTR(name);
- service->path = TAKE_PTR(fpath);
+ *service = (SysvStub) {
+ .sysv_start_priority = -1,
+ .name = TAKE_PTR(name),
+ .path = TAKE_PTR(fpath),
+ };
r = hashmap_put(all_services, service->name, service);
if (r < 0)
return log_oom();
- service = NULL;
+ TAKE_PTR(service);
}
}