projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5bdf224
)
socket: minor modernizations
author
Lennart Poettering
<lennart@poettering.net>
Tue, 7 Apr 2015 16:47:35 +0000
(18:47 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 7 Apr 2015 16:51:45 +0000
(18:51 +0200)
src/core/socket.c
patch
|
blob
|
history
diff --git
a/src/core/socket.c
b/src/core/socket.c
index
f67370b
..
c81fd66
100644
(file)
--- 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;