chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: make bootup graph consistent
[elogind.git]
/
src
/
journal
/
journal-file.c
diff --git
a/src/journal/journal-file.c
b/src/journal/journal-file.c
index c20af5d9bfc2f90041776fe2782f1a954fb5af00..2845e05ce0adcb7333e71c3c85cd5433a6727d12 100644
(file)
--- a/
src/journal/journal-file.c
+++ b/
src/journal/journal-file.c
@@
-323,7
+323,7
@@
static int journal_file_verify_header(JournalFile *f) {
} else if (state == STATE_ARCHIVED)
return -ESHUTDOWN;
else if (state != STATE_OFFLINE) {
} else if (state == STATE_ARCHIVED)
return -ESHUTDOWN;
else if (state != STATE_OFFLINE) {
- log_debug("Journal file %s has unknown state %
u
.", f->path, state);
+ log_debug("Journal file %s has unknown state %
i
.", f->path, state);
return -EBUSY;
}
}
return -EBUSY;
}
}
@@
-1963,11
+1963,12
@@
static int test_object_monotonic(JournalFile *f, uint64_t p, uint64_t needle) {
return TEST_RIGHT;
}
return TEST_RIGHT;
}
-static in
line in
t find_data_object_by_boot_id(
+static int find_data_object_by_boot_id(
JournalFile *f,
sd_id128_t boot_id,
Object **o,
uint64_t *b) {
JournalFile *f,
sd_id128_t boot_id,
Object **o,
uint64_t *b) {
+
char t[sizeof("_BOOT_ID=")-1 + 32 + 1] = "_BOOT_ID=";
sd_id128_to_string(boot_id, t + 9);
char t[sizeof("_BOOT_ID=")-1 + 32 + 1] = "_BOOT_ID=";
sd_id128_to_string(boot_id, t + 9);
@@
-2417,7
+2418,7
@@
void journal_file_dump(JournalFile *f) {
break;
default:
break;
default:
- printf("Type: unknown (%
u
)\n", o->object.type);
+ printf("Type: unknown (%
i
)\n", o->object.type);
break;
}
break;
}
@@
-2623,7
+2624,7
@@
int journal_file_open(
* attributes are not supported we'll just skip this,
* and rely solely on mtime/atime/ctime of the file. */
* attributes are not supported we'll just skip this,
* and rely solely on mtime/atime/ctime of the file. */
- fd_setcrtime(f->fd,
now(CLOCK_REALTIME)
);
+ fd_setcrtime(f->fd,
0
);
#ifdef HAVE_GCRYPT
/* Try to load the FSPRG state, and if we can't, then
#ifdef HAVE_GCRYPT
/* Try to load the FSPRG state, and if we can't, then