journalctl: respect --after-cursor semantics with --follow in all cases

[elogind.git] / src / journal / journal-verify.c

diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 333757b5b54b8a023da35ae1b137c4dfd58bc4ae..7e3c974b331124913b0295858b216997690f8b91 100644 (file)
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -142,7 +142,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
                 compression = o->object.flags & OBJECT_COMPRESSION_MASK;
                 if (compression) {
                         _cleanup_free_ void *b = NULL;
-                        uint64_t alloc = 0, b_size;
+                        size_t alloc = 0, b_size;
 
                         r = decompress_blob(compression,
                                             o->data.payload,
@@ -368,7 +368,7 @@ static int contains_uint64(MMapCache *m, int fd, uint64_t n, uint64_t p) {
 
                 c = (a + b) / 2;
 
-                r = mmap_cache_get(m, fd, PROT_READ|PROT_WRITE, 0, false, c * sizeof(uint64_t), sizeof(uint64_t), NULL, (void **) &z);
+                r = mmap_cache_get(m, fd, PROT_READ|PROT_WRITE, 0, false, c * sizeof(uint64_t), sizeof(uint64_t), NULL, (void **) &z, NULL);
                 if (r < 0)
                         return r;
 
@@ -804,7 +804,7 @@ int journal_file_verify(
         usec_t last_usec = 0;
         int data_fd = -1, entry_fd = -1, entry_array_fd = -1;
         unsigned i;
-        bool found_last;
+        bool found_last = false;
 #ifdef HAVE_GCRYPT
         uint64_t last_tag = 0;
 #endif
@@ -825,21 +825,21 @@ int journal_file_verify(
 
         data_fd = open_tmpfile("/var/tmp", O_RDWR | O_CLOEXEC);
         if (data_fd < 0) {
-                log_error("Failed to create data file: %m");
+                log_error_errno(errno, "Failed to create data file: %m");
                 r = -errno;
                 goto fail;
         }
 
         entry_fd = open_tmpfile("/var/tmp", O_RDWR | O_CLOEXEC);
         if (entry_fd < 0) {
-                log_error("Failed to create entry file: %m");
+                log_error_errno(errno, "Failed to create entry file: %m");
                 r = -errno;
                 goto fail;
         }
 
         entry_array_fd = open_tmpfile("/var/tmp", O_RDWR | O_CLOEXEC);
         if (entry_array_fd < 0) {
-                log_error("Failed to create entry array file: %m");
+                log_error_errno(errno, "Failed to create entry array file: %m");
                 r = -errno;
                 goto fail;
         }