shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

shared/journal-importer: use %m instead of strerror()

Browse Source 
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().
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-10-07 09:18:26 +02:00
parent 3855303428
commit 0cbefc7d4f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/journal-importer.c
View File

@ -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;