X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fsocket.c;h=63e6ed29fe540aff1707434d4d6c0d8ecfa09a1b;hp=cbbfb0cd3a033436a7215ec36fa72300a78ffa01;hb=41f9172f427bdbb8221c64029f78364b8dd4e527;hpb=96342de68d0d6de71a062d984dafd2a0905ed9fe

diff --git a/src/core/socket.c b/src/core/socket.c
index cbbfb0cd3..63e6ed29f 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -39,6 +39,7 @@
 #include "mkdir.h"
 #include "path-util.h"
 #include "unit-name.h"
+#include "unit-printf.h"
 #include "dbus-socket.h"
 #include "missing.h"
 #include "special.h"
@@ -584,7 +585,7 @@ static int instance_from_socket(int fd, unsigned nr, char **instance) {
         }
 
         case AF_INET6: {
-                static const char ipv4_prefix[] = {
+                static const unsigned char ipv4_prefix[] = {
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF
                 };
 
@@ -1850,7 +1851,8 @@ static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
         if (w->socket_accept) {
                 for (;;) {
 
-                        if ((cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK)) < 0) {
+                        cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK);
+                        if (cfd < 0) {
 
                                 if (errno == EINTR)
                                         continue;