chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: add networkd-wait-online
[elogind.git]
/
src
/
journal
/
journald-stream.c
diff --git
a/src/journal/journald-stream.c
b/src/journal/journald-stream.c
index 8958c7f3dec8f1734c124e830b5343fa00d9ce33..36fc755260f585f13ea29e9956d4ef06bedc2fa4 100644
(file)
--- a/
src/journal/journald-stream.c
+++ b/
src/journal/journald-stream.c
@@
-293,7
+293,6
@@
static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents,
if ((revents|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
log_error("Got invalid event from epoll for stdout stream: %"PRIx32, revents);
if ((revents|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
log_error("Got invalid event from epoll for stdout stream: %"PRIx32, revents);
- r = -EIO;
goto terminate;
}
goto terminate;
}
@@
-304,12
+303,11
@@
static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents,
return 0;
log_warning("Failed to read from stream: %m");
return 0;
log_warning("Failed to read from stream: %m");
- r = -errno;
goto terminate;
}
if (l == 0) {
goto terminate;
}
if (l == 0) {
-
r =
stdout_stream_scan(s, true);
+ stdout_stream_scan(s, true);
goto terminate;
}
goto terminate;
}
@@
-356,7
+354,6
@@
static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
Server *s = userdata;
StdoutStream *stream;
int fd, r;
Server *s = userdata;
StdoutStream *stream;
int fd, r;
- socklen_t len;
assert(s);
assert(s);
@@
-388,10
+385,9
@@
static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
stream->fd = fd;
stream->fd = fd;
-
len = sizeof(
stream->ucred);
- if (
getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len)
< 0) {
+
r = getpeercred(fd, &
stream->ucred);
+ if (
r
< 0) {
log_error("Failed to determine peer credentials: %m");
log_error("Failed to determine peer credentials: %m");
- r = -errno;
goto fail;
}
goto fail;
}
@@
-404,11
+400,10
@@
static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
if (shutdown(fd, SHUT_WR) < 0) {
log_error("Failed to shutdown writing side of socket: %m");
if (shutdown(fd, SHUT_WR) < 0) {
log_error("Failed to shutdown writing side of socket: %m");
- r = -errno;
goto fail;
}
goto fail;
}
- r = sd_event_add_io(s->event,
fd, EPOLLIN, stdout_stream_process, stream, &stream->event_source
);
+ r = sd_event_add_io(s->event,
&stream->event_source, fd, EPOLLIN, stdout_stream_process, stream
);
if (r < 0) {
log_error("Failed to add stream to event loop: %s", strerror(-r));
goto fail;
if (r < 0) {
log_error("Failed to add stream to event loop: %s", strerror(-r));
goto fail;
@@
-428,7
+423,7
@@
static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
fail:
stdout_stream_free(stream);
fail:
stdout_stream_free(stream);
- return
r
;
+ return
0
;
}
int server_open_stdout_socket(Server *s) {
}
int server_open_stdout_socket(Server *s) {
@@
-465,7
+460,7
@@
int server_open_stdout_socket(Server *s) {
} else
fd_nonblock(s->stdout_fd, 1);
} else
fd_nonblock(s->stdout_fd, 1);
- r = sd_event_add_io(s->event,
s->stdout_fd, EPOLLIN, stdout_stream_new, s, &s->stdout_event_source
);
+ r = sd_event_add_io(s->event,
&s->stdout_event_source, s->stdout_fd, EPOLLIN, stdout_stream_new, s
);
if (r < 0) {
log_error("Failed to add stdout server fd to event source: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to add stdout server fd to event source: %s", strerror(-r));
return r;