X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-verify.c;h=ed28b457372813e689a09ad0cc9ed4244d6420c3;hb=1e447e0a3cb3e98827938a182593056ddbb13b29;hp=551f04af35d40ae260788a1312f8142aec911418;hpb=0ab5c3ed8750734124c7a1f7fb8a7944f71d6e25;p=elogind.git diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c index 551f04af3..ed28b4573 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -69,7 +69,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { if (!uncompress_blob(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload), - &b, &alloc, &b_size)) + &b, &alloc, &b_size, 0)) return -EBADMSG; h2 = hash64(b, b_size); @@ -178,7 +178,7 @@ static void draw_progress(uint64_t p, usec_t *last_usec) { unsigned n, i, j, k; usec_t z, x; - if (!isatty(STDOUT_FILENO)) + if (!on_tty()) return; z = now(CLOCK_MONOTONIC); @@ -212,7 +212,7 @@ static void draw_progress(uint64_t p, usec_t *last_usec) { static void flush_progress(void) { unsigned n, i; - if (!isatty(STDOUT_FILENO)) + if (!on_tty()) return; n = (3 * columns()) / 4;