diff options
Diffstat (limited to 'src/journal/journal-file.c')
| -rw-r--r-- | src/journal/journal-file.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 5c33c435e2..ec66f4d5a4 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -322,8 +322,7 @@ bool journal_file_is_offlining(JournalFile *f) { __sync_synchronize(); - if (f->offline_state == OFFLINE_DONE || - f->offline_state == OFFLINE_JOINED) + if (IN_SET(f->offline_state, OFFLINE_DONE, OFFLINE_JOINED)) return false; return true; @@ -1651,8 +1650,7 @@ uint64_t journal_file_entry_array_n_items(Object *o) { uint64_t journal_file_hash_table_n_items(Object *o) { assert(o); - if (o->object.type != OBJECT_DATA_HASH_TABLE && - o->object.type != OBJECT_FIELD_HASH_TABLE) + if (!IN_SET(o->object.type, OBJECT_DATA_HASH_TABLE, OBJECT_FIELD_HASH_TABLE)) return 0; return (le64toh(o->object.size) - offsetof(Object, hash_table.items)) / sizeof(HashItem); @@ -3242,8 +3240,7 @@ int journal_file_open( assert(ret); assert(fd >= 0 || fname); - if ((flags & O_ACCMODE) != O_RDONLY && - (flags & O_ACCMODE) != O_RDWR) + if (!IN_SET((flags & O_ACCMODE), O_RDONLY, O_RDWR)) return -EINVAL; if (fname) { |