]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Also drop a few more unnecessary uses of synthethic errno
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 21 Nov 2018 23:51:29 +0000 (00:51 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 22 Nov 2018 09:54:38 +0000 (10:54 +0100)
src/journal-remote/journal-remote.c
src/journal-remote/journal-upload.c
src/udev/udevd.c

index beb75a1cb44c36cf44c5c94a5562f38094e2c6fd..1f3cdb932f7593c292817d4134c6751b7ef48380 100644 (file)
@@ -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;
index 8b0816ba1f5e83e605972c5fdab09592d693a58f..f7b91fddde346027004d41ca488a90c240cf8a20 100644 (file)
@@ -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;
index 6e7bd83d114f37b5ece9b9fadf664c01405c73c0..db33de3c5f800f292f144616e1ae7d1ecc88f1f3 100644 (file)
@@ -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;
                 }