From 0cbefc7d4f3658f6ded60c5a98b0f938156ddc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 7 Oct 2022 09:18:26 +0200 Subject: [PATCH] shared/journal-importer: use %m instead of strerror() Here SYNTHETIC_ERRNO() was used based on the general rule that logging functions should do that when the error value is generated at the call site. But here we're really propagating a memory allocation error, which wasn't reported using errno, but the meaning is the same. And it's better to bend the rule a bit like this than to use strerror(). --- src/shared/journal-importer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c index 66481da267..d9eabec886 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -426,11 +426,10 @@ int journal_importer_push_data(JournalImporter *imp, const char *data, size_t si assert(imp->state != IMPORTER_STATE_EOF); if (!realloc_buffer(imp, imp->filled + size)) - return log_error_errno(SYNTHETIC_ERRNO(ENOMEM), + return log_error_errno(ENOMEM, "Failed to store received data of size %zu " - "(in addition to existing %zu bytes with %zu filled): %s", - size, MALLOC_SIZEOF_SAFE(imp->buf), imp->filled, - strerror_safe(ENOMEM)); + "(in addition to existing %zu bytes with %zu filled): %m", + size, MALLOC_SIZEOF_SAFE(imp->buf), imp->filled); memcpy(imp->buf + imp->filled, data, size); imp->filled += size;