diff options
| author | nikita <nikita@NetBSD.org> | 2020-09-14 20:51:07 +0200 |
|---|---|---|
| committer | nikita <nikita@NetBSD.org> | 2020-09-14 20:51:07 +0200 |
| commit | 0ab4932bcf864e45dc72e59db0f785c5c6c4f6a4 (patch) | |
| tree | 46b860affbd181a0dbb263aa4cca9955c47ef40c /tests/server | |
| parent | ea5627408e41592ac8750032de41b97038811d88 (diff) | |
| parent | 9d954e49bce3706a9a2efb119ecd05767f0f2a9e (diff) | |
| download | gnurl-0ab4932bcf864e45dc72e59db0f785c5c6c4f6a4.tar.gz gnurl-0ab4932bcf864e45dc72e59db0f785c5c6c4f6a4.tar.bz2 gnurl-0ab4932bcf864e45dc72e59db0f785c5c6c4f6a4.zip | |
Merge tag 'curl-7_72_0' into master
curl 7.72.0
Diffstat (limited to 'tests/server')
| -rw-r--r-- | tests/server/util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/server/util.c b/tests/server/util.c index 577a56cb2..dccce596b 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -119,6 +119,7 @@ void logmsg(const char *msg, ...) known_offset = 1; } sec = epoch_offset + tv.tv_sec; + /* !checksrc! disable BANNEDFUNC 1 */ now = localtime(&sec); /* not thread safe but we don't care */ msnprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06ld", @@ -475,7 +476,7 @@ static struct timeval tvnow(void) struct timespec tsnow; if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) { now.tv_sec = tsnow.tv_sec; - now.tv_usec = tsnow.tv_nsec / 1000; + now.tv_usec = (int)(tsnow.tv_nsec / 1000); } /* ** Even when the configure process has truly detected monotonic clock |