X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=time.c;h=6bb9a50f5b32f7441943817dc22f868d0f0131cd;hp=6f6dd49e330df2f4d85565aa65ab1e02615abebd;hb=f23669d91a09066b7ecd7b07a74bea8fad61ad39;hpb=2f07d34b5d4c37606be5849b6ee51e0443707898 diff --git a/time.c b/time.c index 6f6dd49e..6bb9a50f 100644 --- a/time.c +++ b/time.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -31,18 +31,6 @@ void ms2tv(long unsigned n, struct timeval *tv) tv->tv_usec = (n % 1000) * 1000; } -/** - * Convert a double to a struct timeval. - * - * \param x The value to convert. - * \param tv Result pointer. - */ -void d2tv(double x, struct timeval *tv) -{ - tv->tv_sec = x; - tv->tv_usec = (x - (double)tv->tv_sec) * 1000.0 * 1000.0 + 0.5; -} - /** * Compute the difference of two time values. * @@ -55,7 +43,8 @@ void d2tv(double x, struct timeval *tv) * * \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) +int tv_diff(const struct timeval *b, const struct timeval *a, + struct timeval *diff) { int ret = 1; @@ -85,7 +74,7 @@ int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *di * \param sum Contains the sum \a a + \a b on return. */ void tv_add(const struct timeval *a, const struct timeval *b, - struct timeval *sum) + struct timeval *sum) { sum->tv_sec = a->tv_sec + b->tv_sec; if (a->tv_usec + b->tv_usec >= 1000 * 1000) { @@ -104,7 +93,7 @@ void tv_add(const struct timeval *a, const struct timeval *b, * \param result Contains \a mult * \a tv on return. */ void tv_scale(const unsigned long mult, const struct timeval *tv, - struct timeval *result) + struct timeval *result) { uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) * mult; @@ -120,7 +109,7 @@ void tv_scale(const unsigned long mult, const struct timeval *tv, * \param result Contains (1 / mult) * tv on return. */ void tv_divide(const unsigned long divisor, const struct timeval *tv, - struct timeval *result) + struct timeval *result) { uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) / divisor;