From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 8 Feb 2015 22:35:22 +0000 (+0100)
Subject: Fix a bug in subtract_timeval_saturate.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bfa26fe7b6e8f34cfa9a5d79cac8595f0d2b6f83;p=greproxy

Fix a bug in subtract_timeval_saturate.
---

diff --git a/timeutil.cpp b/timeutil.cpp
index b3d58a7..0649f0c 100644
--- a/timeutil.cpp
+++ b/timeutil.cpp
@@ -17,10 +17,10 @@ bool less_than(const timeval &a, const timeval &b)
 	return make_pair(a.tv_sec, a.tv_usec) < make_pair(b.tv_sec, b.tv_usec);
 }
 
-timeval subtract_timeval_saturate(const timeval &a, const timeval &b)
+timeval subtract_timeval_saturate(const timeval &b, const timeval &a)
 {	
 	timeval ret;
-	if (less_than(a, b)) {
+	if (less_than(b, a)) {
 		ret.tv_sec = ret.tv_usec = 0;
 		return ret;
 	}
diff --git a/timeutil.h b/timeutil.h
index 93d6973..ca65adf 100644
--- a/timeutil.h
+++ b/timeutil.h
@@ -5,7 +5,7 @@
 
 double tdiff(const timeval& a, const timeval& b);
 bool less_than(const timeval &a, const timeval &b);
-timeval subtract_timeval_saturate(const timeval &a, const timeval &b);
+timeval subtract_timeval_saturate(const timeval &b, const timeval &a);  // b - a
 timeval offset_timeval_seconds(const timeval &a, double s);
 
 #endif  // !defined(_TIMEUTIL_H)