diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-03-03 13:07:10 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-03-05 07:10:13 +0900 |
| commit | f5fbe71d956957ca7ceb6777aed05a416fc83a43 (patch) | |
| tree | 67358d417604030867a979f216bbb79939a37844 /src/journal | |
| parent | ef1e0b9a461c4baa12bdda47579c2c017209c3be (diff) | |
| download | systemd-f5fbe71d956957ca7ceb6777aed05a416fc83a43.tar.gz | |
tree-wide: use UINT64_MAX or friends
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/fuzz-journald-stream.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-context.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-native.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 4 | ||||
| -rw-r--r-- | src/journal/test-journal-config.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/journal/fuzz-journald-stream.c b/src/journal/fuzz-journald-stream.c index 038b335cb3..8a979df3ce 100644 --- a/src/journal/fuzz-journald-stream.c +++ b/src/journal/fuzz-journald-stream.c @@ -27,7 +27,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { assert_se(stdout_stream_install(&s, stream_fds[0], &stream) >= 0); assert_se(write(stream_fds[1], data, size) == (ssize_t) size); while (ioctl(stream_fds[0], SIOCINQ, &v) == 0 && v) - sd_event_run(s.event, (uint64_t) -1); + sd_event_run(s.event, UINT64_MAX); if (s.n_stdout_streams) stdout_stream_destroy(stream); server_done(&s); diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c index 58151aa03d..add0a5480d 100644 --- a/src/journal/journald-context.c +++ b/src/journal/journald-context.c @@ -69,7 +69,7 @@ static size_t cache_max(void) { static size_t cached = -1; - if (cached == (size_t) -1) { + if (cached == SIZE_MAX) { uint64_t mem_total; int r; diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 1c5849ed55..102814a403 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -105,7 +105,7 @@ static int server_process_entry( * * Note that *remaining is altered on both success and failure. */ - size_t n = 0, j, tn = (size_t) -1, m = 0, entry_size = 0; + size_t n = 0, j, tn = SIZE_MAX, m = 0, entry_size = 0; char *identifier = NULL, *message = NULL; struct iovec *iovec = NULL; int priority = LOG_INFO; diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 4234ab2e61..e76c13a3b6 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -2185,7 +2185,7 @@ int server_init(Server *s, const char *namespace) { .notify_fd = -1, .compress.enabled = true, - .compress.threshold_bytes = (uint64_t) -1, + .compress.threshold_bytes = UINT64_MAX, .seal = true, .set_audit = true, @@ -2593,7 +2593,7 @@ int config_parse_compress( if (isempty(rvalue)) { compress->enabled = true; - compress->threshold_bytes = (uint64_t) -1; + compress->threshold_bytes = UINT64_MAX; } else if (streq(rvalue, "1")) { log_syntax(unit, LOG_WARNING, filename, line, 0, "Compress= ambiguously specified as 1, enabling compression with default threshold"); diff --git a/src/journal/test-journal-config.c b/src/journal/test-journal-config.c index 4f29e1b310..bd0de9600a 100644 --- a/src/journal/test-journal-config.c +++ b/src/journal/test-journal-config.c @@ -43,7 +43,7 @@ static void test_config_compress(void) { /* Invalid Case */ COMPRESS_PARSE_CHECK("-1", true, 111); COMPRESS_PARSE_CHECK("blah blah", true, 111); - COMPRESS_PARSE_CHECK("", true, (uint64_t)-1); + COMPRESS_PARSE_CHECK("", true, UINT64_MAX); } int main(int argc, char *argv[]) { |