Mercurial > dovecot > original-hg > dovecot-1.2

changeset 9312:00a1d109ecf6 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
timeval_diff_*() fixes.
author Timo Sirainen <tss@iki.fi>
date Wed, 12 Aug 2009 17:27:25 -0400
parents d48640a2ab4a
children 34179f0f4d6a
files src/lib/time-util.c
diffstat 1 files changed, 2 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/time-util.c	Wed Aug 12 17:06:07 2009 -0400
+++ b/src/lib/time-util.c	Wed Aug 12 17:27:25 2009 -0400
@@ -20,16 +20,7 @@
 
 int timeval_diff_msecs(const struct timeval *tv1, const struct timeval *tv2)
 {
-	time_t secs;
-	int usecs;
-
-	secs = tv1->tv_sec - tv2->tv_sec;
-	usecs = tv1->tv_usec - tv2->tv_usec;
-	if (usecs < 0) {
-		secs++;
-		usecs += 1000000;
-	}
-	return (secs * 1000) + (usecs/1000);
+	return timeval_diff_usecs(tv1, tv2) / 1000;
 }
 
 long long timeval_diff_usecs(const struct timeval *tv1,
@@ -41,7 +32,7 @@
 	secs = tv1->tv_sec - tv2->tv_sec;
 	usecs = tv1->tv_usec - tv2->tv_usec;
 	if (usecs < 0) {
-		secs++;
+		secs--;
 		usecs += 1000000;
 	}
 	return ((long long)secs * 1000000ULL) + usecs;