Skip to content

Commit 406f5ea

Browse files
authored
Several Coverity fixes (systemd#37253)
2 parents b09f351 + 9d902ed commit 406f5ea

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/core/device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ static const struct {
364364
static int device_found_to_string_many(DeviceFound flags, char **ret) {
365365
_cleanup_free_ char *s = NULL;
366366

367-
assert(flags >= 0);
367+
assert((flags & ~_DEVICE_FOUND_MASK) == 0);
368368
assert(ret);
369369

370370
FOREACH_ELEMENT(i, device_found_map) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4070,8 +4070,7 @@ int journal_file_open(
40704070
int r;
40714071

40724072
assert(fd >= 0 || fname);
4073-
assert(file_flags >= 0);
4074-
assert(file_flags <= _JOURNAL_FILE_FLAGS_MAX);
4073+
assert((file_flags & ~_JOURNAL_FILE_FLAGS_ALL) == 0);
40754074
assert(mmap_cache);
40764075
assert(ret);
40774076

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ typedef enum JournalFileFlags {
132132
JOURNAL_COMPRESS = 1 << 0,
133133
JOURNAL_SEAL = 1 << 1,
134134
JOURNAL_STRICT_ORDER = 1 << 2,
135-
_JOURNAL_FILE_FLAGS_MAX = JOURNAL_COMPRESS|JOURNAL_SEAL|JOURNAL_STRICT_ORDER,
135+
_JOURNAL_FILE_FLAGS_ALL = JOURNAL_COMPRESS|JOURNAL_SEAL|JOURNAL_STRICT_ORDER,
136136
} JournalFileFlags;
137137

138138
typedef struct {

src/shared/format-table.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ typedef enum TableErsatz {
8686
TABLE_ERSATZ_UNSET,
8787
TABLE_ERSATZ_NA,
8888
_TABLE_ERSATZ_MAX,
89+
_TABLE_ERSATZ_INVALID = -EINVAL,
8990
} TableErsatz;
9091

9192
typedef struct Table Table;

0 commit comments

Comments
 (0)