morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

journal-verify: get rid of strerror

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-09-12 19:41:33 +01:00
parent f5e757f1ce
commit 581fc868be
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/journal/journal-verify.c
View File

@@ -118,6 +118,11 @@ static void flush_progress(void) {
log_error(OFSfmt": " _fmt, (uint64_t)_offset, ##__VA_ARGS__); \
} while (0)
#define error_errno(_offset, error, _fmt, ...) do { \
flush_progress(); \
log_error_errno(error, OFSfmt": " _fmt, (uint64_t)_offset, ##__VA_ARGS__); \
} while (0)
static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o) {
uint64_t i;
@@ -168,8 +173,8 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
le64toh(o->object.size) - offsetof(Object, data.payload),
&b, &alloc, &b_size, 0);
if (r < 0) {
error(offset, "%s decompression failed: %s",
object_compressed_to_string(compression), strerror(-r));
error_errno(offset, r, "%s decompression failed: %m",
object_compressed_to_string(compression));
return r;
}
@@ -912,7 +917,7 @@ int journal_file_verify(
r = journal_file_object_verify(f, p, o);
if (r < 0) {
error(p, "Invalid object contents: %s", strerror(-r));
error_errno(p, r, "Invalid object contents: %m");
goto fail;
}