From f7a5bb2842037fa27dbc99d92c3fee7fe1bbbc2a Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Fri, 18 Jul 2014 14:01:13 -0400 Subject: Small modernizations --- src/journal/journald-native.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/journal/journald-native.c') diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 0f3936a146..d73280c8cf 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -383,12 +383,15 @@ void server_process_native_file( } int server_open_native_socket(Server*s) { - union sockaddr_union sa; int one, r; assert(s); if (s->native_fd < 0) { + union sockaddr_union sa = { + .un.sun_family = AF_UNIX, + .un.sun_path = "/run/systemd/journal/socket", + }; s->native_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); if (s->native_fd < 0) { @@ -396,10 +399,6 @@ int server_open_native_socket(Server*s) { return -errno; } - zero(sa); - sa.un.sun_family = AF_UNIX; - strncpy(sa.un.sun_path, "/run/systemd/journal/socket", sizeof(sa.un.sun_path)); - unlink(sa.un.sun_path); r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path)); -- cgit v1.2.3-54-g00ecf