chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal-upload: avoid calling printf with maximum precision
[elogind.git]
/
src
/
initctl
/
initctl.c
diff --git
a/src/initctl/initctl.c
b/src/initctl/initctl.c
index 0000d6ccd4fd5039d94dc76ab9025ac7922134a6..f1c2b8dfb4ad8652d9829ccb065b6d694797c383 100644
(file)
--- a/
src/initctl/initctl.c
+++ b/
src/initctl/initctl.c
@@
-114,7
+114,7
@@
static void change_runlevel(Server *s, int runlevel) {
assert(s);
target = translate_runlevel(runlevel, &isolate);
assert(s);
target = translate_runlevel(runlevel, &isolate);
- if(!target) {
+ if
(!target) {
log_warning("Got request for unknown runlevel %c, ignoring.", runlevel);
return;
}
log_warning("Got request for unknown runlevel %c, ignoring.", runlevel);
return;
}
@@
-217,8
+217,8
@@
static int fifo_process(Fifo *f) {
if (errno == EAGAIN)
return 0;
if (errno == EAGAIN)
return 0;
- log_warning("Failed to read from fifo: %
s", strerror(errno)
);
- return -
1
;
+ log_warning("Failed to read from fifo: %
m"
);
+ return -
errno
;
}
f->bytes_read += l;
}
f->bytes_read += l;
@@
-245,7
+245,7
@@
static void fifo_free(Fifo *f) {
if (f->server)
epoll_ctl(f->server->epoll_fd, EPOLL_CTL_DEL, f->fd, NULL);
if (f->server)
epoll_ctl(f->server->epoll_fd, EPOLL_CTL_DEL, f->fd, NULL);
-
close_nointr_nofail
(f->fd);
+
safe_close
(f->fd);
}
free(f);
}
free(f);
@@
-257,8
+257,7
@@
static void server_done(Server *s) {
while (s->fifos)
fifo_free(s->fifos);
while (s->fifos)
fifo_free(s->fifos);
- if (s->epoll_fd >= 0)
- close_nointr_nofail(s->epoll_fd);
+ safe_close(s->epoll_fd);
if (s->bus) {
sd_bus_flush(s->bus);
if (s->bus) {
sd_bus_flush(s->bus);
@@
-278,7
+277,7
@@
static int server_init(Server *s, unsigned n_sockets) {
s->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
if (s->epoll_fd < 0) {
r = -errno;
s->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
if (s->epoll_fd < 0) {
r = -errno;
- log_error("Failed to create epoll object: %
s", strerror(errno)
);
+ log_error("Failed to create epoll object: %
m"
);
goto fail;
}
goto fail;
}
@@
-305,8
+304,7
@@
static int server_init(Server *s, unsigned n_sockets) {
f = new0(Fifo, 1);
if (!f) {
r = -ENOMEM;
f = new0(Fifo, 1);
if (!f) {
r = -ENOMEM;
- log_error("Failed to create fifo object: %s",
- strerror(errno));
+ log_error("Failed to create fifo object: %m");
goto fail;
}
goto fail;
}
@@
-318,8
+316,7
@@
static int server_init(Server *s, unsigned n_sockets) {
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
r = -errno;
fifo_free(f);
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
r = -errno;
fifo_free(f);
- log_error("Failed to add fifo fd to epoll object: %s",
- strerror(errno));
+ log_error("Failed to add fifo fd to epoll object: %m");
goto fail;
}
goto fail;
}
@@
-386,7
+383,8
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- if ((n = sd_listen_fds(true)) < 0) {
+ n = sd_listen_fds(true);
+ if (n < 0) {
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
return EXIT_FAILURE;
}
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
return EXIT_FAILURE;
}
@@
-399,7
+397,7
@@
int main(int argc, char *argv[]) {
if (server_init(&server, (unsigned) n) < 0)
return EXIT_FAILURE;
if (server_init(&server, (unsigned) n) < 0)
return EXIT_FAILURE;
- log_debug("systemd-initctl running as pid
%lu", (unsigned long)
getpid());
+ log_debug("systemd-initctl running as pid
"PID_FMT,
getpid());
sd_notify(false,
"READY=1\n"
sd_notify(false,
"READY=1\n"
@@
-416,7
+414,7
@@
int main(int argc, char *argv[]) {
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;
- log_error("epoll_wait() failed: %
s", strerror(errno)
);
+ log_error("epoll_wait() failed: %
m"
);
goto fail;
}
goto fail;
}
@@
-429,10
+427,11
@@
int main(int argc, char *argv[]) {
r = EXIT_SUCCESS;
r = EXIT_SUCCESS;
- log_debug("systemd-initctl stopped as pid
%lu", (unsigned long)
getpid());
+ log_debug("systemd-initctl stopped as pid
"PID_FMT,
getpid());
fail:
sd_notify(false,
fail:
sd_notify(false,
+ "STOPPING=1\n"
"STATUS=Shutting down...");
server_done(&server);
"STATUS=Shutting down...");
server_done(&server);