mirror of
https://github.com/moparisthebest/curl
synced 2024-11-10 11:35:07 -05:00
b9d25f9a6b
... to cater for systems with unsigned time_t variables. - Renamed the functions to curlx_timediff and Curl_timediff_us. - Added overflow protection for both of them in either direction for both 32 bit and 64 bit time_ts - Reprefixed the curlx_time functions to use Curl_* Reported-by: Peter Piekarski Fixes #2004 Closes #2005
67 lines
1.9 KiB
C
67 lines
1.9 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2017, 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
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "curlcheck.h"
|
|
|
|
#include "timeval.h"
|
|
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop(void)
|
|
{
|
|
|
|
}
|
|
|
|
struct a {
|
|
struct curltime first;
|
|
struct curltime second;
|
|
time_t result;
|
|
};
|
|
|
|
UNITTEST_START
|
|
{
|
|
struct a tests[] = {
|
|
{ {36762, 8345 }, {36761, 995926 }, 13 },
|
|
{ {36761, 995926 }, {36762, 8345 }, -13 },
|
|
{ {36761, 995926 }, {0, 0}, 36761995 },
|
|
{ {0, 0}, {36761, 995926 }, -36761995 },
|
|
};
|
|
size_t i;
|
|
|
|
for(i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
|
|
timediff_t result = Curl_timediff(tests[i].first, tests[i].second);
|
|
if(result != tests[i].result) {
|
|
printf("%d.%06u to %d.%06u got %d, but expected %d\n",
|
|
tests[i].first.tv_sec,
|
|
tests[i].first.tv_usec,
|
|
tests[i].second.tv_sec,
|
|
tests[i].second.tv_usec,
|
|
result,
|
|
tests[i].result);
|
|
fail("unexpected result!");
|
|
}
|
|
}
|
|
}
|
|
UNITTEST_STOP
|