X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-verify.c;h=f74adcbc8938955e074f7bd6029ceeaa5caf1c70;hb=75a5f1d837739fc84a7c5af14797490774a10646;hp=333757b5b54b8a023da35ae1b137c4dfd58bc4ae;hpb=54f3ff079f05fd024ff3686eeea26ab705994494;p=elogind.git diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c index 333757b5b..f74adcbc8 100644 --- 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