From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 7 Apr 2015 16:47:35 +0000 (+0200)
Subject: socket: minor modernizations
X-Git-Tag: v220~555
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5403f09aa0c548d2739f132c2699a6ad44dad51;p=platform%2Fupstream%2Fsystemd.git

socket: minor modernizations
---

diff --git a/src/core/socket.c b/src/core/socket.c
index f67370b..c81fd66 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2315,8 +2315,7 @@ static int socket_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
                                 if (errno == EINTR)
                                         continue;
 
-                                log_unit_error(UNIT(p->socket)->id,
-                                               "Failed to accept socket: %m");
+                                log_unit_error(UNIT(p->socket)->id, "Failed to accept socket: %m");
                                 goto fail;
                         }
 
@@ -2523,7 +2522,8 @@ int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds) {
                 return 0;
         }
 
-        if (!(rfds = new(int, rn_fds)))
+        rfds = new(int, rn_fds);
+        if (!rfds)
                 return -ENOMEM;
 
         k = 0;