diff options
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/time-util.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/basic/time-util.h b/src/basic/time-util.h index 26b5a4df0a..9894e626c5 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -139,11 +139,13 @@ static inline usec_t usec_add(usec_t a, usec_t b) { static inline usec_t usec_sub(usec_t timestamp, int64_t delta) { if (delta < 0) - timestamp = usec_add(timestamp, (usec_t) (-delta)); - else if (timestamp > (usec_t) delta) - timestamp -= delta; - else - timestamp = 0; + return usec_add(timestamp, (usec_t) (-delta)); - return timestamp; + if (timestamp == USEC_INFINITY) /* Make sure infinity doesn't degrade */ + return USEC_INFINITY; + + if (timestamp < (usec_t) delta) + return 0; + + return timestamp - delta; } |