From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Aug 2014 14:51:44 +0000 (+0200)
Subject: manager: reuse sockaddr_union instead of redefining our own version of it
X-Git-Tag: v217~801
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=55836941ff642d42403921fa9d5fd2f8376ae722;ds=sidebyside

manager: reuse sockaddr_union instead of redefining our own version of it
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 445461b6b..e488aba5f 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -527,13 +527,10 @@ static int manager_setup_notify(Manager *m) {
 
         if (m->notify_fd < 0) {
                 _cleanup_close_ int fd = -1;
-                union {
-                        struct sockaddr sa;
-                        struct sockaddr_un un;
-                } sa = {
+                union sockaddr_union sa =  {
                         .sa.sa_family = AF_UNIX,
                 };
-                int one = 1;
+                static const int one = 1;
 
                 /* First free all secondary fields */
                 free(m->notify_socket);