From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 26 May 2020 12:31:34 +0000 (+0200)
Subject: core: some more structured initialization
X-Git-Tag: v246-rc1~269^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0cea477d4aebe8e1df2f91edc488245ab15f571;p=thirdparty%2Fsystemd.git

core: some more structured initialization
---

diff --git a/src/core/service.c b/src/core/service.c
index 3e955edeffc..aebb7778bcb 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -447,14 +447,17 @@ static int service_add_fd_store(Service *s, int fd, const char *name, bool do_po
                 }
         }
 
-        fs = new0(ServiceFDStore, 1);
+        fs = new(ServiceFDStore, 1);
         if (!fs)
                 return -ENOMEM;
 
-        fs->fd = fd;
-        fs->service = s;
-        fs->do_poll = do_poll;
-        fs->fdname = strdup(name ?: "stored");
+        *fs = (ServiceFDStore) {
+                .fd = fd,
+                .service = s,
+                .do_poll = do_poll,
+                .fdname = strdup(name ?: "stored"),
+        };
+
         if (!fs->fdname) {
                 free(fs);
                 return -ENOMEM;