moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-05 00:55:04 -05:00
Code Issues Releases Wiki Activity

util: silence conversion warnings

Browse Source 
timeval::tv_usec might be a 32-bit integer and timespec::tv_nsec might
be a 64-bit integer. This is the case when building for recent macOS
versions, for example. Just treat tv_usec as an int, which should
hopefully always be sufficient on systems with
`HAVE_CLOCK_GETTIME_MONOTONIC`.

Closes https://github.com/curl/curl/pull/5695
This commit is contained in:
Marcel Raad 2020-07-16 18:52:03 +02:00
parent 2998749850
commit c90e48c005
No known key found for this signature in database
GPG Key ID: 9D24FF0262C36959
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tool_util.c
View File

@ -74,7 +74,7 @@ struct timeval tvnow(void)
struct timespec tsnow; struct timespec tsnow;
if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) { if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) {
now.tv_sec = tsnow.tv_sec; 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 ** Even when the configure process has truly detected monotonic clock

2
tests/libtest/testutil.c
View File

@ -55,7 +55,7 @@ struct timeval tutil_tvnow(void)
struct timespec tsnow; struct timespec tsnow;
if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) { if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) {
now.tv_sec = tsnow.tv_sec; 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 ** Even when the configure process has truly detected monotonic clock

2
tests/server/util.c
View File

@ -475,7 +475,7 @@ static struct timeval tvnow(void)
struct timespec tsnow; struct timespec tsnow;
if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) { if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) {
now.tv_sec = tsnow.tv_sec; 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 ** Even when the configure process has truly detected monotonic clock