diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-07-29 12:23:31 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-07-29 13:20:20 +0200 |
| commit | 3a43da2832dc5360a638d043f469a6dcbe025582 (patch) | |
| tree | e3b60e840bb087c1af7f458676e3ab6bf04ea49e /src/shared/time-util.c | |
| parent | cf347234ae78630dd4aad8907f027965e7fb9040 (diff) | |
time-util: add and use USEC/NSEC_INFINIY
Diffstat (limited to 'src/shared/time-util.c')
| -rw-r--r-- | src/shared/time-util.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/shared/time-util.c b/src/shared/time-util.c index 76ab143f34..2dc01e6ed3 100644 --- a/src/shared/time-util.c +++ b/src/shared/time-util.c @@ -49,8 +49,8 @@ dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u) { int64_t delta; assert(ts); - if (u == (usec_t) -1) { - ts->realtime = ts->monotonic = (usec_t) -1; + if (u == USEC_INFINITY) { + ts->realtime = ts->monotonic = USEC_INFINITY; return ts; } @@ -76,8 +76,8 @@ dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u) { int64_t delta; assert(ts); - if (u == (usec_t) -1) { - ts->realtime = ts->monotonic = (usec_t) -1; + if (u == USEC_INFINITY) { + ts->realtime = ts->monotonic = USEC_INFINITY; return ts; } @@ -98,10 +98,10 @@ usec_t timespec_load(const struct timespec *ts) { if (ts->tv_sec == (time_t) -1 && ts->tv_nsec == (long) -1) - return (usec_t) -1; + return USEC_INFINITY; if ((usec_t) ts->tv_sec > (UINT64_MAX - (ts->tv_nsec / NSEC_PER_USEC)) / USEC_PER_SEC) - return (usec_t) -1; + return USEC_INFINITY; return (usec_t) ts->tv_sec * USEC_PER_SEC + @@ -111,7 +111,7 @@ usec_t timespec_load(const struct timespec *ts) { struct timespec *timespec_store(struct timespec *ts, usec_t u) { assert(ts); - if (u == (usec_t) -1) { + if (u == USEC_INFINITY) { ts->tv_sec = (time_t) -1; ts->tv_nsec = (long) -1; return ts; @@ -128,10 +128,10 @@ usec_t timeval_load(const struct timeval *tv) { if (tv->tv_sec == (time_t) -1 && tv->tv_usec == (suseconds_t) -1) - return (usec_t) -1; + return USEC_INFINITY; if ((usec_t) tv->tv_sec > (UINT64_MAX - tv->tv_usec) / USEC_PER_SEC) - return (usec_t) -1; + return USEC_INFINITY; return (usec_t) tv->tv_sec * USEC_PER_SEC + @@ -141,7 +141,7 @@ usec_t timeval_load(const struct timeval *tv) { struct timeval *timeval_store(struct timeval *tv, usec_t u) { assert(tv); - if (u == (usec_t) -1) { + if (u == USEC_INFINITY) { tv->tv_sec = (time_t) -1; tv->tv_usec = (suseconds_t) -1; } else { @@ -159,7 +159,7 @@ char *format_timestamp(char *buf, size_t l, usec_t t) { assert(buf); assert(l > 0); - if (t <= 0 || t == (usec_t) -1) + if (t <= 0 || t == USEC_INFINITY) return NULL; sec = (time_t) (t / USEC_PER_SEC); @@ -177,7 +177,7 @@ char *format_timestamp_us(char *buf, size_t l, usec_t t) { assert(buf); assert(l > 0); - if (t <= 0 || t == (usec_t) -1) + if (t <= 0 || t == USEC_INFINITY) return NULL; sec = (time_t) (t / USEC_PER_SEC); @@ -198,7 +198,7 @@ char *format_timestamp_relative(char *buf, size_t l, usec_t t) { n = now(CLOCK_REALTIME); - if (t <= 0 || (t == (usec_t) -1)) + if (t <= 0 || (t == USEC_INFINITY)) return NULL; if (n > t) { @@ -279,7 +279,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) { assert(buf); assert(l > 0); - if (t == (usec_t) -1) + if (t == USEC_INFINITY) return NULL; if (t <= 0) { |