summaryrefslogtreecommitdiff
path: root/tests/libtest/lib582.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2012-06-28 17:14:41 +0200
committerYang Tse <yangsita@gmail.com>2012-06-28 17:14:41 +0200
commitdd707b746fcb14e4336175be2946ed9c082e6dc7 (patch)
tree2c5741b5a75dba871e258f325bdf4520eadfd05e /tests/libtest/lib582.c
parentac6111aeb09dd258154afdecb289898674435813 (diff)
downloadcurl-dd707b746fcb14e4336175be2946ed9c082e6dc7.tar.gz
lib582.c: fix conversion warning
Diffstat (limited to 'tests/libtest/lib582.c')
-rw-r--r--tests/libtest/lib582.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c
index 25b70609c..641b9b6df 100644
--- a/tests/libtest/lib582.c
+++ b/tests/libtest/lib582.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -172,7 +172,7 @@ static int checkForCompletion(CURLM* curl, int* success)
static int getMicroSecondTimeout(struct timeval* timeout)
{
struct timeval now;
- int result;
+ ssize_t result;
gettimeofday(&now, 0);
result = (timeout->tv_sec - now.tv_sec) * 1000000 +
@@ -180,7 +180,7 @@ static int getMicroSecondTimeout(struct timeval* timeout)
if (result < 0)
result = 0;
- return result;
+ return curlx_sztosi(result);
}
/**