summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-01 16:13:51 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-01 22:18:15 +0100
commit53f555b6f6b0a9fb58a781e40e3db67924a2a9c8 (patch)
tree48cc7696fd324eab689bd482e6813ac54da4b706 /src/basic
parent011696f76233486bc56c266b18a328924f70269c (diff)
util: add usec_add() which adds two usec_t values with overflow handling
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/time-util.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index 7321e3c670..b37d5ad5dc 100644
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -127,3 +127,16 @@ time_t mktime_or_timegm(struct tm *tm, bool utc);
struct tm *localtime_or_gmtime_r(const time_t *t, struct tm *tm, bool utc);
unsigned long usec_to_jiffies(usec_t usec);
+
+static inline usec_t usec_add(usec_t a, usec_t b) {
+ usec_t c;
+
+ /* Adds two time values, and makes sure USEC_INFINITY as input results as USEC_INFINITY in output, and doesn't
+ * overflow. */
+
+ c = a + b;
+ if (c < a || c < b) /* overflow check */
+ return USEC_INFINITY;
+
+ return c;
+}