X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-file.c;h=2845e05ce0adcb7333e71c3c85cd5433a6727d12;hb=93a1e66efd4b0f4cda29c467d20d0f7510c0b3a8;hp=c1b54046f9af92eeeb8ebe60424fe4b789099df1;hpb=d61b600dde1f267a408440011aa980e0ed44bea6;p=elogind.git diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index c1b54046f..2845e05ce 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -323,7 +323,7 @@ static int journal_file_verify_header(JournalFile *f) { } else if (state == STATE_ARCHIVED) return -ESHUTDOWN; else if (state != STATE_OFFLINE) { - log_debug("Journal file %s has unknown state %u.", f->path, state); + log_debug("Journal file %s has unknown state %i.", f->path, state); return -EBUSY; } } @@ -1963,11 +1963,12 @@ static int test_object_monotonic(JournalFile *f, uint64_t p, uint64_t needle) { return TEST_RIGHT; } -static inline int find_data_object_by_boot_id( +static int find_data_object_by_boot_id( JournalFile *f, sd_id128_t boot_id, Object **o, uint64_t *b) { + char t[sizeof("_BOOT_ID=")-1 + 32 + 1] = "_BOOT_ID="; sd_id128_to_string(boot_id, t + 9); @@ -2417,7 +2418,7 @@ void journal_file_dump(JournalFile *f) { break; default: - printf("Type: unknown (%u)\n", o->object.type); + printf("Type: unknown (%i)\n", o->object.type); break; }