chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util: fix path_is_mount_point() for symlinks
[elogind.git]
/
src
/
journal
/
journal-verify.c
diff --git
a/src/journal/journal-verify.c
b/src/journal/journal-verify.c
index 75792a5a6030ae1b349afc1f885e0c53c1aac731..35c270cb3400df609a5bf25aa5d7f95f77bfac89 100644
(file)
--- a/
src/journal/journal-verify.c
+++ b/
src/journal/journal-verify.c
@@
-32,7
+32,6
@@
#include "journal-verify.h"
#include "lookup3.h"
#include "compress.h"
#include "journal-verify.h"
#include "lookup3.h"
#include "compress.h"
-#include "fsprg.h"
static void draw_progress(uint64_t p, usec_t *last_usec) {
unsigned n, i, j, k;
static void draw_progress(uint64_t p, usec_t *last_usec) {
unsigned n, i, j, k;
@@
-865,7
+864,7
@@
int journal_file_verify(
if (show_progress)
draw_progress(0x7FFF * p / le64toh(f->header->tail_object_offset), &last_usec);
if (show_progress)
draw_progress(0x7FFF * p / le64toh(f->header->tail_object_offset), &last_usec);
- r = journal_file_move_to_object(f,
-1
, p, &o);
+ r = journal_file_move_to_object(f,
OBJECT_UNUSED
, p, &o);
if (r < 0) {
error(p, "invalid object");
goto fail;
if (r < 0) {
error(p, "invalid object");
goto fail;
@@
-1085,11
+1084,11
@@
int journal_file_verify(
q = last_tag;
while (q <= p) {
q = last_tag;
while (q <= p) {
- r = journal_file_move_to_object(f,
-1
, q, &o);
+ r = journal_file_move_to_object(f,
OBJECT_UNUSED
, q, &o);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = journal_file_hmac_put_object(f,
-1
, o, q);
+ r = journal_file_hmac_put_object(f,
OBJECT_UNUSED
, o, q);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-1097,7
+1096,7
@@
int journal_file_verify(
}
/* Position might have changed, let's reposition things */
}
/* Position might have changed, let's reposition things */
- r = journal_file_move_to_object(f,
-1
, p, &o);
+ r = journal_file_move_to_object(f,
OBJECT_UNUSED
, p, &o);
if (r < 0)
goto fail;
if (r < 0)
goto fail;