chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-icmp6-nd: Add helper function to get the IPv6 link MTU
[elogind.git]
/
src
/
journal
/
journal-authenticate.c
diff --git
a/src/journal/journal-authenticate.c
b/src/journal/journal-authenticate.c
index 5ab1982bf097ab4cca7d26f6b216f0d86ae48e16..b3e2601c4e18976e9a85dd85a12dfb8c81b77c75 100644
(file)
--- a/
src/journal/journal-authenticate.c
+++ b/
src/journal/journal-authenticate.c
@@
-229,7
+229,7
@@
int journal_file_maybe_append_tag(JournalFile *f, uint64_t realtime) {
return 0;
}
return 0;
}
-int journal_file_hmac_put_object(JournalFile *f,
int
type, Object *o, uint64_t p) {
+int journal_file_hmac_put_object(JournalFile *f,
ObjectType
type, Object *o, uint64_t p) {
int r;
assert(f);
int r;
assert(f);
@@
-246,7
+246,7
@@
int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p
if (r < 0)
return r;
} else {
if (r < 0)
return r;
} else {
- if (type >
= 0
&& o->object.type != type)
+ if (type >
OBJECT_UNUSED
&& o->object.type != type)
return -EBADMSG;
}
return -EBADMSG;
}
@@
-339,7
+339,7
@@
int journal_file_fss_load(JournalFile *f) {
fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY, 0600);
if (fd < 0) {
if (errno != ENOENT)
fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY, 0600);
if (fd < 0) {
if (errno != ENOENT)
- log_error
(
"Failed to open %s: %m", p);
+ log_error
_errno(errno,
"Failed to open %s: %m", p);
r = -errno;
goto finish;
r = -errno;
goto finish;