diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-10-15 13:11:04 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-10-15 13:11:04 +0000 |
commit | 5b644acf614a7784a7a72a6107c0e67a2e361691 (patch) | |
tree | 835bbf736f6a398a5e883cfa3b5c8be25a75e106 | |
parent | 085940711d9ef419271274cad740ea8ea61f6fe1 (diff) | |
download | netsurf-5b644acf614a7784a7a72a6107c0e67a2e361691.tar.gz netsurf-5b644acf614a7784a7a72a6107c0e67a2e361691.tar.bz2 |
Move timeval_subtract to utils/log.c & make it static, as it's not used anywhere else
svn path=/trunk/netsurf/; revision=13059
-rw-r--r-- | utils/log.c | 30 | ||||
-rw-r--r-- | utils/utils.c | 28 | ||||
-rw-r--r-- | utils/utils.h | 1 |
3 files changed, 29 insertions, 30 deletions
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 <sys/time.h> #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; diff --git a/utils/utils.c b/utils/utils.c index ca8cb49f1..3398a7df8 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -281,34 +281,6 @@ unsigned int wallclock(void) return ((tv.tv_sec * 100) + (tv.tv_usec / 10000)); } -/* Subtract the `struct timeval' values X and Y, - storing the result in RESULT. - Return 1 if the difference is negative, otherwise 0. -*/ - -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; -} - #ifndef HAVE_STRCASESTR /** diff --git a/utils/utils.h b/utils/utils.h index ffd4f2977..f00ea286a 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -139,7 +139,6 @@ void unicode_transliterate(unsigned int c, char **r); char *human_friendly_bytesize(unsigned long bytesize); const char *rfc1123_date(time_t t); unsigned int wallclock(void); -int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y); /** * Return a hex digit for the given numerical value. |