From 9d902ed4ccd20068cf59175f73a17bb39819c642 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 26 Apr 2025 09:35:43 +0900 Subject: [PATCH] journal-file: fix meaning less assertion Closes CID#1609495. --- src/libsystemd/sd-journal/journal-file.c | 3 +-- src/libsystemd/sd-journal/journal-file.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index c4e2bd15918..7dc1c3b6477 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -4070,8 +4070,7 @@ int journal_file_open( int r; assert(fd >= 0 || fname); - assert(file_flags >= 0); - assert(file_flags <= _JOURNAL_FILE_FLAGS_MAX); + assert((file_flags & ~_JOURNAL_FILE_FLAGS_ALL) == 0); assert(mmap_cache); assert(ret); diff --git a/src/libsystemd/sd-journal/journal-file.h b/src/libsystemd/sd-journal/journal-file.h index 60196813163..89b06b08345 100644 --- a/src/libsystemd/sd-journal/journal-file.h +++ b/src/libsystemd/sd-journal/journal-file.h @@ -132,7 +132,7 @@ typedef enum JournalFileFlags { JOURNAL_COMPRESS = 1 << 0, JOURNAL_SEAL = 1 << 1, JOURNAL_STRICT_ORDER = 1 << 2, - _JOURNAL_FILE_FLAGS_MAX = JOURNAL_COMPRESS|JOURNAL_SEAL|JOURNAL_STRICT_ORDER, + _JOURNAL_FILE_FLAGS_ALL = JOURNAL_COMPRESS|JOURNAL_SEAL|JOURNAL_STRICT_ORDER, } JournalFileFlags; typedef struct { -- 2.47.3