X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=time.c;h=6672dca4215c3e04de75f576dabc2dfd7c95eb30;hp=83231c895020245d72cea40cd34cae03e9951a29;hb=refs%2Fheads%2Fv0.2;hpb=6e2e2739acdbacb5f0d4b4272b0e04f74184c66a

diff --git a/time.c b/time.c
index 83231c89..6672dca4 100644
--- a/time.c
+++ b/time.c
@@ -113,21 +113,10 @@ void tv_scale(const unsigned long mult, const struct timeval *tv,
 void tv_divide(const unsigned long divisor, const struct timeval *tv,
 	struct timeval *result)
 {
-	long unsigned q;
+	uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) / divisor;
 
-	if (!divisor) {
-		PARA_EMERG_LOG("%s\n", "division by zero");
-		exit(EXIT_FAILURE);
-	}
-	q = tv->tv_usec / divisor;
-	result->tv_sec = tv->tv_sec / divisor;
-	result->tv_usec = (tv->tv_sec - result->tv_sec * divisor)
-		* 1000 * 1000 / divisor;
-	if (result->tv_usec + q >= 1000 * 1000) {
-		result->tv_sec++;
-		result->tv_usec = 1000 * 1000 - result->tv_usec - q;
-	} else
-		result->tv_usec += q;
+	result->tv_sec = x / 1000 / 1000;
+	result->tv_usec = x % (1000 * 1000);
 }
 
 /**