chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket.c: make use of union sockaddr_union
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 35531edb751e3cd0c5635b1791f7bfcb6849c5eb..8ecc9f9950577557c2bec4f369a7af45a4f4e47a 100644
(file)
--- 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;
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);
assert(fd >= 0);
assert(instance);