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
342 lines
7.3 KiB
C
342 lines
7.3 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 "curl_setup.h"
|
|
|
|
#include "curlx/warnless.h"
|
|
|
|
#if defined(__INTEL_COMPILER) && defined(__unix__)
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
|
|
#endif /* __INTEL_COMPILER && __unix__ */
|
|
|
|
#define CURL_MASK_UCHAR ((unsigned char)~0)
|
|
|
|
#define CURL_MASK_USHORT ((unsigned short)~0)
|
|
|
|
#define CURL_MASK_UINT ((unsigned int)~0)
|
|
#define CURL_MASK_SINT (CURL_MASK_UINT >> 1)
|
|
|
|
#define CURL_MASK_ULONG ((unsigned long)~0)
|
|
|
|
#define CURL_MASK_USIZE_T ((size_t)~0)
|
|
#define CURL_MASK_SSIZE_T (CURL_MASK_USIZE_T >> 1)
|
|
|
|
/*
|
|
* unsigned long to unsigned char
|
|
*/
|
|
unsigned char curlx_ultouc(unsigned long ulnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(ulnum <= (unsigned long)CURL_MASK_UCHAR);
|
|
return (unsigned char)(ulnum & (unsigned long)CURL_MASK_UCHAR);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned size_t to signed int
|
|
*/
|
|
int curlx_uztosi(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uznum <= (size_t)CURL_MASK_SINT);
|
|
return (int)(uznum & (size_t)CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned size_t to unsigned long
|
|
*/
|
|
unsigned long curlx_uztoul(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
#if ULONG_MAX < SIZE_MAX
|
|
DEBUGASSERT(uznum <= (size_t)CURL_MASK_ULONG);
|
|
#endif
|
|
return (unsigned long)(uznum & (size_t)CURL_MASK_ULONG);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned size_t to unsigned int
|
|
*/
|
|
unsigned int curlx_uztoui(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
#if UINT_MAX < SIZE_MAX
|
|
DEBUGASSERT(uznum <= (size_t)CURL_MASK_UINT);
|
|
#endif
|
|
return (unsigned int)(uznum & (size_t)CURL_MASK_UINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed long to signed int
|
|
*/
|
|
int curlx_sltosi(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
#if INT_MAX < LONG_MAX
|
|
DEBUGASSERT((unsigned long)slnum <= (unsigned long)CURL_MASK_SINT);
|
|
#endif
|
|
return (int)(slnum & (long)CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed long to unsigned int
|
|
*/
|
|
unsigned int curlx_sltoui(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
#if UINT_MAX < LONG_MAX
|
|
DEBUGASSERT((unsigned long)slnum <= (unsigned long)CURL_MASK_UINT);
|
|
#endif
|
|
return (unsigned int)(slnum & (long)CURL_MASK_UINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed long to unsigned short
|
|
*/
|
|
unsigned short curlx_sltous(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
DEBUGASSERT((unsigned long)slnum <= (unsigned long)CURL_MASK_USHORT);
|
|
return (unsigned short)(slnum & (long)CURL_MASK_USHORT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned size_t to signed ssize_t
|
|
*/
|
|
ssize_t curlx_uztosz(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uznum <= (size_t)CURL_MASK_SSIZE_T);
|
|
return (ssize_t)(uznum & (size_t)CURL_MASK_SSIZE_T);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed curl_off_t to unsigned size_t
|
|
*/
|
|
size_t curlx_sotouz(curl_off_t sonum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sonum >= 0);
|
|
return (size_t)(sonum & (curl_off_t)CURL_MASK_USIZE_T);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed ssize_t to signed int
|
|
*/
|
|
int curlx_sztosi(ssize_t sznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sznum >= 0);
|
|
#if INT_MAX < SSIZE_MAX
|
|
DEBUGASSERT((size_t)sznum <= (size_t)CURL_MASK_SINT);
|
|
#endif
|
|
return (int)(sznum & (ssize_t)CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* unsigned int to unsigned short
|
|
*/
|
|
unsigned short curlx_uitous(unsigned int uinum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uinum <= (unsigned int)CURL_MASK_USHORT);
|
|
return (unsigned short)(uinum & (unsigned int)CURL_MASK_USHORT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* signed int to unsigned size_t
|
|
*/
|
|
size_t curlx_sitouz(int sinum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sinum >= 0);
|
|
return (size_t)sinum;
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
size_t curlx_uitouz(unsigned int uinum)
|
|
{
|
|
return (size_t)uinum;
|
|
}
|
|
|
|
size_t curlx_sotouz_range(curl_off_t sonum, size_t uzmin, size_t uzmax)
|
|
{
|
|
if(sonum < 0)
|
|
return uzmin;
|
|
#if SIZEOF_CURL_OFF_T > SIZEOF_SIZE_T
|
|
if(sonum > SIZE_MAX)
|
|
return uzmax;
|
|
#endif
|
|
return CURLMIN(CURLMAX((size_t)sonum, uzmin), uzmax);
|
|
}
|
|
|
|
bool curlx_sztouz(ssize_t sznum, size_t *puznum)
|
|
{
|
|
if(sznum < 0) {
|
|
*puznum = 0;
|
|
return FALSE;
|
|
}
|
|
*puznum = (size_t)sznum;
|
|
return TRUE;
|
|
}
|
|
|
|
bool curlx_sotouz_fits(curl_off_t sonum, size_t *puznum)
|
|
{
|
|
if(sonum < 0) {
|
|
*puznum = 0;
|
|
return FALSE;
|
|
}
|
|
#if SIZEOF_CURL_OFF_T > SIZEOF_SIZE_T
|
|
if(sonum > SIZE_MAX) {
|
|
*puznum = 0;
|
|
return FALSE;
|
|
}
|
|
#endif
|
|
*puznum = (size_t)sonum;
|
|
return TRUE;
|
|
}
|
|
|
|
bool curlx_sltouz(long slnum, size_t *puznum)
|
|
{
|
|
if(slnum < 0) {
|
|
*puznum = 0;
|
|
return FALSE;
|
|
}
|
|
/* We error in curl_setup.h if SIZEOF_LONG > SIZEOF_SIZE_T */
|
|
*puznum = (size_t)slnum;
|
|
return TRUE;
|
|
}
|
|
|
|
curl_off_t curlx_uztoso(size_t uznum)
|
|
{
|
|
#if SIZEOF_SIZE_T >= SIZEOF_CURL_OFF_T
|
|
if(uznum > (size_t)CURL_OFF_T_MAX)
|
|
return CURL_OFF_T_MAX;
|
|
#endif
|
|
return (curl_off_t)uznum;
|
|
}
|