]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal-file: fix meaning less assertion 37253/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 26 Apr 2025 00:35:43 +0000 (09:35 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 26 Apr 2025 00:37:18 +0000 (09:37 +0900)
Closes CID#1609495.

src/libsystemd/sd-journal/journal-file.c
src/libsystemd/sd-journal/journal-file.h

index c4e2bd15918b665ceea8f05c190b276a61852a5e..7dc1c3b647713d514370a02f4b84e60989577ae4 100644 (file)
@@ -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);
 
index 60196813163616d34adb19a595229732825cb9c2..89b06b0834557c1f8f081d1a7df091b4025b3dcb 100644 (file)
@@ -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 {