From 5b644acf614a7784a7a72a6107c0e67a2e361691 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 15 Oct 2011 13:11:04 +0000 Subject: Move timeval_subtract to utils/log.c & make it static, as it's not used anywhere else svn path=/trunk/netsurf/; revision=13059 --- utils/log.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'utils/log.c') diff --git a/utils/log.c b/utils/log.c index 0f9290bf7..b20b32380 100644 --- a/utils/log.c +++ b/utils/log.c @@ -25,7 +25,6 @@ #include #include "desktop/netsurf.h" -#include "utils/utils.h" #include "utils/log.h" nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv) @@ -58,6 +57,35 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv) #ifndef NDEBUG +/* Subtract the `struct timeval' values X and Y, + storing the result in RESULT. + Return 1 if the difference is negative, otherwise 0. +*/ + +static int +timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y) +{ + /* Perform the carry for the later subtraction by updating y. */ + if (x->tv_usec < y->tv_usec) { + int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1; + y->tv_usec -= 1000000 * nsec; + y->tv_sec += nsec; + } + if (x->tv_usec - y->tv_usec > 1000000) { + int nsec = (x->tv_usec - y->tv_usec) / 1000000; + y->tv_usec += 1000000 * nsec; + y->tv_sec -= nsec; + } + + /* Compute the time remaining to wait. + tv_usec is certainly positive. */ + result->tv_sec = x->tv_sec - y->tv_sec; + result->tv_usec = x->tv_usec - y->tv_usec; + + /* Return 1 if result is negative. */ + return x->tv_sec < y->tv_sec; +} + const char *nslog_gettime(void) { static struct timeval start_tv; -- cgit v1.2.3