mirror of
https://github.com/curl/curl.git
synced 2026-04-11 12:01:42 +08:00
3058ed3df8
Backtrack on previous change that aimed to solve the wrong `share.h` being included. It turns out it did not fix this issue. At the same time it introduced relative header filenames and the need to include the same headers differently depending on the source files' location, reducing readability and editability. Replace this method by re-adding curl's lib source directory to the header path and addressing headers by the their full, relative name to that base directory. Aligning with this method already used in src and tests. With these advantages: - makes includes easier to read, recognize, grep, sort, write, and copy between sources, - syncs the way these headers are included across curl components, - avoids the ambiguity between system `schannel.h`, `rustls.h` vs. local headers using the same names in `lib/vtls`, - silences clang-tidy `readability-duplicate-include` checker, which detects the above issue, Ref: https://clang.llvm.org/extra/clang-tidy/checks/readability/duplicate-include.html - possibly silences TIOBE coding standard warnings: `6.10.2.a: Don't use relative paths in #include statements.` - long shot: it works well with concatenated test sources, for clang-tidy-friendly custom unity builds. Ref: #20667 Slight downside: it's not enforced. If there happens to be a collision between a local `lib/*.h` header and a system one, the solution is to rename (possibly with its `.c` counterpart) into the `curl_` namespace. This is also the method used by curl in the past. Also: - curlx/inet_pton: reduce scope of an include. - toolx/tool_time: apply this to an include, and update VS project files accordingly. Also dropping unnecessary lib/curlx header path. - clang-tidy: enable `readability-duplicate-include`. Follow-up to3887069c66#19676 Follow-up to625f2c1644#16991 #16949 Closes #20623
86 lines
2.6 KiB
C
86 lines
2.6 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 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.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.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curlx/timediff.h"
|
|
|
|
/*
|
|
* Converts number of milliseconds into a timeval structure.
|
|
*
|
|
* Return values:
|
|
* NULL IF tv is NULL or ms < 0 (eg. no timeout -> blocking select)
|
|
* tv with 0 in both fields IF ms == 0 (eg. 0ms timeout -> polling select)
|
|
* tv with converted fields IF ms > 0 (eg. >0ms timeout -> waiting select)
|
|
*/
|
|
struct timeval *curlx_mstotv(struct timeval *tv, timediff_t ms)
|
|
{
|
|
if(!tv)
|
|
return NULL;
|
|
|
|
if(ms < 0)
|
|
return NULL;
|
|
|
|
if(ms > 0) {
|
|
timediff_t tv_sec = ms / 1000;
|
|
timediff_t tv_usec = (ms % 1000) * 1000; /* max=999000 */
|
|
#ifdef HAVE_SUSECONDS_T
|
|
#if TIMEDIFF_T_MAX > TIME_T_MAX
|
|
/* tv_sec overflow check in case time_t is signed */
|
|
if(tv_sec > TIME_T_MAX)
|
|
tv_sec = TIME_T_MAX;
|
|
#endif
|
|
tv->tv_sec = (time_t)tv_sec;
|
|
tv->tv_usec = (suseconds_t)tv_usec;
|
|
#elif defined(_WIN32) /* maybe also others in the future */
|
|
#if TIMEDIFF_T_MAX > LONG_MAX
|
|
/* tv_sec overflow check on Windows there we know it is long */
|
|
if(tv_sec > LONG_MAX)
|
|
tv_sec = LONG_MAX;
|
|
#endif
|
|
tv->tv_sec = (long)tv_sec;
|
|
tv->tv_usec = (long)tv_usec;
|
|
#else
|
|
#if TIMEDIFF_T_MAX > INT_MAX
|
|
/* tv_sec overflow check in case time_t is signed */
|
|
if(tv_sec > INT_MAX)
|
|
tv_sec = INT_MAX;
|
|
#endif
|
|
tv->tv_sec = (int)tv_sec;
|
|
tv->tv_usec = (int)tv_usec;
|
|
#endif
|
|
}
|
|
else {
|
|
tv->tv_sec = 0;
|
|
tv->tv_usec = 0;
|
|
}
|
|
|
|
return tv;
|
|
}
|
|
|
|
/*
|
|
* Converts a timeval structure into number of milliseconds.
|
|
*/
|
|
timediff_t curlx_tvtoms(struct timeval *tv)
|
|
{
|
|
return (tv->tv_sec * 1000) + (timediff_t)(tv->tv_usec / 1000);
|
|
}
|