summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Kaufmann <mail@michael-kaufmann.ch>2017-05-20 19:39:51 +0200
committerMichael Kaufmann <mail@michael-kaufmann.ch>2017-05-24 22:56:22 +0200
commit8ab22a74533acee61af31c48e75269822f408cb4 (patch)
tree24025f8450cf3b72eb5bf9316c1212b0a571363c /src
parentb4d87f54d60711e936fefae388d741b281eecdf0 (diff)
downloadcurl-8ab22a74533acee61af31c48e75269822f408cb4.tar.gz
time: fix type conversions and compiler warnings
Fix bugs and compiler warnings on systems with 32-bit long and 64-bit time_t. Reviewed-by: Daniel Stenberg Closes #1499
Diffstat (limited to 'src')
-rw-r--r--src/tool_util.c11
-rw-r--r--src/tool_util.h2
2 files changed, 2 insertions, 11 deletions
diff --git a/src/tool_util.c b/src/tool_util.c
index 15b91d303..dab60f0bd 100644
--- a/src/tool_util.c
+++ b/src/tool_util.c
@@ -121,8 +121,8 @@ struct timeval tool_tvnow(void)
*/
long tool_tvdiff(struct timeval newer, struct timeval older)
{
- return (newer.tv_sec-older.tv_sec)*1000+
- (newer.tv_usec-older.tv_usec)/1000;
+ return (long)(newer.tv_sec-older.tv_sec)*1000+
+ (long)(newer.tv_usec-older.tv_usec)/1000;
}
/*
@@ -137,10 +137,3 @@ double tool_tvdiff_secs(struct timeval newer, struct timeval older)
(double)(newer.tv_usec-older.tv_usec)/1000000.0;
return (double)(newer.tv_usec-older.tv_usec)/1000000.0;
}
-
-/* return the number of seconds in the given input timeval struct */
-long tool_tvlong(struct timeval t1)
-{
- return t1.tv_sec;
-}
-
diff --git a/src/tool_util.h b/src/tool_util.h
index 8f72d6261..d5b3898ff 100644
--- a/src/tool_util.h
+++ b/src/tool_util.h
@@ -45,12 +45,10 @@ long tool_tvlong(struct timeval t1);
#undef tvnow
#undef tvdiff
#undef tvdiff_secs
-#undef tvlong
#define tvnow() tool_tvnow()
#define tvdiff(a,b) tool_tvdiff((a), (b))
#define tvdiff_secs(a,b) tool_tvdiff_secs((a), (b))
-#define tvlong(a) tool_tvlong((a))
#endif /* HEADER_CURL_TOOL_UTIL_H */