diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-22 00:51:29 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-22 10:54:38 +0100 |
commit | d4e98880e9e2118831f23b4572eae698b4dd27fb (patch) | |
tree | a65843df5a816e175a6aa5640bb58a3745f68692 /src | |
parent | 886cf317c4cace1874e251e54bfe5d1e01d6591a (diff) | |
download | systemd-d4e98880e9e2118831f23b4572eae698b4dd27fb.tar.gz |
Also drop a few more unnecessary uses of synthethic errno
Diffstat (limited to 'src')
-rw-r--r-- | src/journal-remote/journal-remote.c | 2 | ||||
-rw-r--r-- | src/journal-remote/journal-upload.c | 3 | ||||
-rw-r--r-- | src/udev/udevd.c | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index beb75a1cb4..1f3cdb932f 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 8b0816ba1f..f7b91fddde 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 6e7bd83d11..db33de3c5f 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; } |