X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-verify.c;h=1a67d5a04bddff7eff3f32a5dfdd166320bfc022;hb=2fb7a5ce67fd6196416919535fa6a6065e0ea815;hp=7d2e5eb1c24bf4e455484cd0626dc2b93d5fdf01;hpb=2a7b539a82a45202c0e990c45da25ccdc487d633;p=elogind.git

diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 7d2e5eb1c..1a67d5a04 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -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;
@@ -670,7 +670,8 @@ int journal_file_verify(
                 bool show_progress) {
         int r;
         Object *o;
-        uint64_t p = 0, last_tag = 0, last_epoch = 0, last_tag_realtime = 0, last_sealed_realtime = 0;
+        uint64_t p = 0, last_epoch = 0, last_tag_realtime = 0, last_sealed_realtime = 0;
+
         uint64_t entry_seqnum = 0, entry_monotonic = 0, entry_realtime = 0;
         sd_id128_t entry_boot_id;
         bool entry_seqnum_set = false, entry_monotonic_set = false, entry_realtime_set = false, found_main_entry_array = false;
@@ -682,7 +683,9 @@ int journal_file_verify(
                 entry_array_path[] = "/var/tmp/journal-entry-array-XXXXXX";
         unsigned i;
         bool found_last;
-
+#ifdef HAVE_GCRYPT
+        uint64_t last_tag = 0;
+#endif
         assert(f);
 
         if (key) {
@@ -981,9 +984,10 @@ int journal_file_verify(
                                 last_tag_realtime = rt;
                                 last_sealed_realtime = entry_realtime;
                         }
-#endif
 
                         last_tag = p + ALIGN64(le64toh(o->object.size));
+#endif
+
                         last_epoch = le64toh(o->tag.epoch);
 
                         n_tags ++;