From: Zbigniew Jędrzejewski-Szmek Date: Wed, 21 Nov 2018 23:51:29 +0000 (+0100) Subject: Also drop a few more unnecessary uses of synthethic errno X-Git-Tag: v240~249^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4e98880e9e2118831f23b4572eae698b4dd27fb;p=thirdparty%2Fsystemd.git Also drop a few more unnecessary uses of synthethic errno --- diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index beb75a1cb44..1f3cdb932f7 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -408,7 +408,7 @@ int journal_remote_handle_raw_source( log_debug("%zu active sources remaining", s->active); return 0; } else if (r == -E2BIG) { - log_notice_errno(E2BIG, "Entry too big, skipped"); + log_notice("Entry too big, skipped"); return 1; } else if (r == -EAGAIN) { return 0; diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 8b0816ba1f5..f7b91fddde3 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -77,8 +77,7 @@ static size_t output_callback(char *buf, if (nmemb && !u->answer) { u->answer = strndup(buf, size*nmemb); if (!u->answer) - log_warning_errno(ENOMEM, "Failed to store server answer (%zu bytes): %m", - size*nmemb); + log_warning("Failed to store server answer (%zu bytes): out of memory", size*nmemb); } return size * nmemb; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 6e7bd83d114..db33de3c5f8 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -793,8 +793,7 @@ static int on_exit_timeout(sd_event_source *s, uint64_t usec, void *userdata) { assert(manager); - log_error_errno(ETIMEDOUT, "Giving up waiting for workers to finish."); - + log_error("Giving up waiting for workers to finish."); sd_event_exit(manager->event, -ETIMEDOUT); return 1; @@ -956,7 +955,7 @@ static int on_worker(sd_event_source *s, int fd, uint32_t revents, void *userdat return log_error_errno(errno, "Failed to receive message: %m"); } else if (size != sizeof(struct worker_message)) { - log_warning_errno(EIO, "Ignoring worker message with invalid size %zi bytes", size); + log_warning("Ignoring worker message with invalid size %zi bytes", size); continue; } @@ -968,7 +967,7 @@ static int on_worker(sd_event_source *s, int fd, uint32_t revents, void *userdat } if (!ucred || ucred->pid <= 0) { - log_warning_errno(EIO, "Ignoring worker message without valid PID"); + log_warning("Ignoring worker message without valid PID"); continue; }