Merge pull request #24933 from keszybz/erradicate-strerror

Erradicate strerror

2 files changed, 3 insertions, 2 deletions

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index f0d28fd48b..11de07fcfa 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1460,7 +1460,7 @@ static int add_boot(sd_journal *j) {
         r = get_boots(j, NULL, &boot_id, arg_boot_offset);
         assert(r <= 1);
         if (r <= 0) {
-                const char *reason = (r == 0) ? "No such boot ID in journal" : strerror_safe(r);
+                const char *reason = (r == 0) ? "No such boot ID in journal" : STRERROR(r);
 
                 if (sd_id128_is_null(arg_boot_id))
                         log_error("Data from the specified boot (%+i) is not available: %s",
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index bfa9f44a83..71d7a59bda 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1094,7 +1094,8 @@ void server_driver_message(Server *s, pid_t object_pid, const char *message_id,
                 /* We failed to format the message. Emit a warning instead. */
                 char buf[LINE_MAX];
 
-                xsprintf(buf, "MESSAGE=Entry printing failed: %s", strerror_safe(r));
+                errno = -r;
+                xsprintf(buf, "MESSAGE=Entry printing failed: %m");
 
                 n = 3;
                 iovec[n++] = IOVEC_MAKE_STRING("PRIORITY=4");