chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: hand out proper dbus object paths for jobs
[elogind.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index 926a0fb646d8dddfefc53458c46a792a4bfcde2c..dd5076552020e9a79918e06f2afcd2873fed2a78 100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-5,7
+5,7
@@
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
-#include <sys/poll.h>
+#include <sys/
e
poll.h>
#include <signal.h>
#include "unit.h"
#include <signal.h>
#include "unit.h"
@@
-285,7
+285,7
@@
static int socket_watch_fds(Socket *s) {
if (p->fd < 0)
continue;
if (p->fd < 0)
continue;
- if ((r = unit_watch_fd(UNIT(s), p->fd, POLLIN, &p->fd_watch)) < 0)
+ if ((r = unit_watch_fd(UNIT(s), p->fd,
E
POLLIN, &p->fd_watch)) < 0)
goto fail;
}
goto fail;
}
@@
-634,7
+634,7
@@
static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
log_debug("Incoming traffic on %s", unit_id(u));
log_debug("Incoming traffic on %s", unit_id(u));
- if (events != POLLIN)
+ if (events !=
E
POLLIN)
socket_enter_stop_pre(s, false);
socket_enter_running(s);
socket_enter_stop_pre(s, false);
socket_enter_running(s);
@@
-656,7
+656,7
@@
static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
exec_status_fill(&s->control_command->exec_status, pid, code, status);
s->control_pid = 0;
exec_status_fill(&s->control_command->exec_status, pid, code, status);
s->control_pid = 0;
- log_debug("%s control process exited, code=%s status=%i", unit_id(u), sigchld_code(code), status);
+ log_debug("%s control process exited, code=%s status=%i", unit_id(u), sigchld_code
_to_string
(code), status);
if (s->control_command->command_next &&
(success || (s->state == SOCKET_EXEC_STOP_PRE || s->state == SOCKET_EXEC_STOP_POST))) {
if (s->control_command->command_next &&
(success || (s->state == SOCKET_EXEC_STOP_PRE || s->state == SOCKET_EXEC_STOP_POST))) {