From: Daniel Buch <boogiewasthere@gmail.com>
Date: Wed, 12 Mar 2014 19:09:25 +0000 (+0100)
Subject: socket.c: make use of union sockaddr_union
X-Git-Tag: v212~202
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9d16d0c7d0b05e3ff278c3c95e1f2f871f348dd3

socket.c: make use of union sockaddr_union
---

diff --git a/src/core/socket.c b/src/core/socket.c
index 35531edb7..8ecc9f995 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -597,13 +597,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
 static int instance_from_socket(int fd, unsigned nr, char **instance) {
         socklen_t l;
         char *r;
-        union {
-                struct sockaddr sa;
-                struct sockaddr_un un;
-                struct sockaddr_in in;
-                struct sockaddr_in6 in6;
-                struct sockaddr_storage storage;
-        } local, remote;
+        union sockaddr_union local, remote;
 
         assert(fd >= 0);
         assert(instance);