X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=time.c;h=155e11d86e99dcbdef2535108c5602fa1752efc5;hp=809cefc92ff9b4334669cc837936db2ee0def6ac;hb=bbea823f656bff170f190a094b8e3da0cdca2c46;hpb=48027ab6ec9113c037dfd388e91579ecf0a70eae

diff --git a/time.c b/time.c
index 809cefc9..155e11d8 100644
--- a/time.c
+++ b/time.c
@@ -53,7 +53,7 @@ void d2tv(double x, struct timeval *tv)
  * If \a diff is not \p NULL, it contains the absolute value |\a b - \a a| on
  * return.
  *
- * \return If \a b < \a, this function returns -1, otherwise it returns 1.
+ * \return If \a b < \a a, this function returns -1, otherwise it returns 1.
  */
 int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *diff)
 {
@@ -82,8 +82,7 @@ int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *di
  *
  * \param a First addend.
  * \param b Second addend.
- *
- * \param \a Sum contains the sum \a + \a b on return.
+ * \param sum Contains the sum \a + \a b on return.
  */
 void tv_add(const struct timeval *a, const struct timeval *b,
 	struct timeval *sum)
@@ -122,17 +121,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;
 
-	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);
 }
 
 /**