treewide: auto-convert the simple cases to log_*_errno()
As a followup to 086891e5c1 "log: add an "error" parameter to all
low-level logging calls and intrdouce log_error_errno() as log calls
that take error numbers", use sed to convert the simple cases to use
the new macros:
find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/'
Multi-line log_*() invocations are not covered.
And we also should add log_unit_*_errno().
This commit is contained in:
@@ -328,7 +328,7 @@ static int server_init(Server *s, unsigned n_sockets) {
|
||||
|
||||
r = bus_open_system_systemd(&s->bus);
|
||||
if (r < 0) {
|
||||
log_error("Failed to get D-Bus connection: %s", strerror(-r));
|
||||
log_error_errno(-r, "Failed to get D-Bus connection: %m");
|
||||
r = -EIO;
|
||||
goto fail;
|
||||
}
|
||||
@@ -355,7 +355,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
|
||||
f = (Fifo*) ev->data.ptr;
|
||||
r = fifo_process(f);
|
||||
if (r < 0) {
|
||||
log_info("Got error on fifo: %s", strerror(-r));
|
||||
log_info_errno(-r, "Got error on fifo: %m");
|
||||
fifo_free(f);
|
||||
return r;
|
||||
}
|
||||
@@ -385,7 +385,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
n = sd_listen_fds(true);
|
||||
if (n < 0) {
|
||||
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
|
||||
log_error_errno(-r, "Failed to read listening file descriptors from environment: %m");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user