]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sysv: use structured initialization
authorLennart Poettering <lennart@poettering.net>
Tue, 26 May 2020 12:47:05 +0000 (14:47 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 26 May 2020 21:52:26 +0000 (23:52 +0200)
src/sysv-generator/sysv-generator.c

index 5df5743823d522c0562938193b8c00b5f41deac7..a667a8ebad190bbdec705d0ef6cb0a39162e1147 100644 (file)
@@ -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);
                 }
         }