| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From f491dfdc88ddbba36a24a75b2063aff027461b83 Mon Sep 17 00:00:00 2001 |
| 2 | From: Adrian Bunk <bunk@stusta.de> |
| 3 | Date: Thu, 16 May 2019 22:20:07 +0300 |
| 4 | Subject: Replace the legacy ULONG_LONG_MAX with the C99 ULLONG_MAX |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | Signed-off-by: Adrian Bunk <bunk@stusta.de> |
| 8 | --- |
| 9 | src/journal-remote/journal-remote-main.c | 4 ++-- |
| 10 | src/shutdown/shutdown.c | 2 +- |
| 11 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 12 | |
| 13 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c |
| 14 | index 2321a91e7b..d32c51c3ce 100644 |
| 15 | --- a/src/journal-remote/journal-remote-main.c |
| 16 | +++ b/src/journal-remote/journal-remote-main.c |
| 17 | @@ -528,7 +528,7 @@ static int dispatch_http_event(sd_event_source *event, |
| 18 | void *userdata) { |
| 19 | MHDDaemonWrapper *d = userdata; |
| 20 | int r; |
| 21 | - MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX; |
| 22 | + MHD_UNSIGNED_LONG_LONG timeout = ULLONG_MAX; |
| 23 | |
| 24 | assert(d); |
| 25 | |
| 26 | @@ -538,7 +538,7 @@ static int dispatch_http_event(sd_event_source *event, |
| 27 | return log_error_errno(SYNTHETIC_ERRNO(EINVAL), |
| 28 | "MHD_run failed!"); |
| 29 | if (MHD_get_timeout(d->daemon, &timeout) == MHD_NO) |
| 30 | - timeout = ULONG_LONG_MAX; |
| 31 | + timeout = ULLONG_MAX; |
| 32 | |
| 33 | r = sd_event_source_set_time(d->timer_event, timeout); |
| 34 | if (r < 0) { |
| 35 | diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c |
| 36 | index 35b2c2aa46..9623fe9ea2 100644 |
| 37 | --- a/src/shutdown/shutdown.c |
| 38 | +++ b/src/shutdown/shutdown.c |
| 39 | @@ -212,7 +212,7 @@ static int sync_making_progress(unsigned long long *prev_dirty) { |
| 40 | } |
| 41 | |
| 42 | static void sync_with_progress(void) { |
| 43 | - unsigned long long dirty = ULONG_LONG_MAX; |
| 44 | + unsigned long long dirty = ULLONG_MAX; |
| 45 | unsigned checks; |
| 46 | pid_t pid; |
| 47 | int r; |
| 48 | -- |
| 49 | 2.20.1 |
| 50 | |