summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--utils/log.c30
-rw-r--r--utils/utils.c28
-rw-r--r--utils/utils.h1
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.