chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: be a bit more verbose when vacuuming
[elogind.git]
/
src
/
initctl
/
initctl.c
diff --git
a/src/initctl/initctl.c
b/src/initctl/initctl.c
index 735f1e145047fa4f368a41c713b1ec93b55ae824..ec33040509094b8e584d1159d3a9dd91903d91e5 100644
(file)
--- a/
src/initctl/initctl.c
+++ b/
src/initctl/initctl.c
@@
-122,7
+122,7
@@
static void change_runlevel(Server *s, int runlevel) {
if (isolate)
mode = "isolate";
else
if (isolate)
mode = "isolate";
else
- mode = "replace";
+ mode = "replace
-irreversibly
";
log_debug("Running request %s/start/%s", target, mode);
log_debug("Running request %s/start/%s", target, mode);
@@
-223,8
+223,10
@@
static int fifo_process(Fifo *f) {
assert(f);
errno = EIO;
assert(f);
errno = EIO;
- if ((l = read(f->fd, ((uint8_t*) &f->buffer) + f->bytes_read, sizeof(f->buffer) - f->bytes_read)) <= 0) {
-
+ l = read(f->fd,
+ ((uint8_t*) &f->buffer) + f->bytes_read,
+ sizeof(f->buffer) - f->bytes_read);
+ if (l <= 0) {
if (errno == EAGAIN)
return 0;
if (errno == EAGAIN)
return 0;
@@
-372,8
+374,8
@@
static int process_event(Server *s, struct epoll_event *ev) {
}
f = (Fifo*) ev->data.ptr;
}
f = (Fifo*) ev->data.ptr;
-
- if (
(r = fifo_process(f))
< 0) {
+ r = fifo_process(f);
+ if (
r
< 0) {
log_info("Got error on fifo: %s", strerror(-r));
fifo_free(f);
return r;
log_info("Got error on fifo: %s", strerror(-r));
fifo_free(f);
return r;