mirror of
https://github.com/curl/curl.git
synced 2026-05-25 20:16:19 +03:00
`-Weverything` is not enabled by curl, and not recommended by LLVM, because it may enable experimental options, and will result in new fallouts after toolchain upgrades. This patch aims to fix/silence as much as possible as found with llvm/clang 21.1.0. It also permanently enables warnings that were fixed in source and deemed manageable in the future. `-Wformat` warnings are addressed separately via #18343. Fix/silence warnings in the source: - typecheck-gcc.h: fix `-Wreserved-identifier`. - lib: silence `-Wcast-function-type-strict`. For llvm 16+ or Apple clang 16+. - asyn-ares: limit `HAPPY_EYEBALLS_DNS_TIMEOUT` to old c-ares versions. - curl_trc: fix `-Wc++-hidden-decl`. - doh: fix `-Wc++-keyword`. - ftp: fix `-Wreserved-identifier`. - ldap: fix `-Wreserved-identifier`. - mqtt: comment unused macro to avoid warning. - multi_ev: drop unused macros to avoid warnings. - setopt: fix useless `break;` after `return;`. - gtls, mbedtls, rustls: silence `-Wconditional-uninitialized`. - socks_sspi, schannel, x509asn1: fix `-Wimplicit-int-enum-cast`. - x509asn1: fix `-Wc++-keyword`. - openssl: scope `OSSL_UI_METHOD_CAST` to avoid unused macro warning. - libssh2, wolfssl: drop unused macros. - curl_ngtcp2, curl_quiche, httpsrr, urlapi: drop/limit unused macros. - tool_getparam: fix useless `break;` after `return;` or `break;`. Not normally enabled because it doesn't work with unity. https://github.com/llvm/llvm-project/issues/71046 - tool_operate: fix `-Wc++-keyword`. - curlinfo: fix a `-Wunsafe-buffer-usage`. - tests: silence `-Wformat-non-iso`. - lib557: fix `-Wreserved-identifier`. - lib1565: silence `-Wconditional-uninitialized`. Enable the above clang warnings permanently in picky mode: - `-Wc++-hidden-decl` - `-Wc++-keyword` (except for Windows, where it collides with `wchar_t`) - `-Wcast-function-type-strict` - `-Wcast-function-type` - `-Wconditional-uninitialized` - `-Wformat-non-iso` (except for clang-cl) - `-Wreserved-identifier` - `-Wtentative-definition-compat` Silence problematic `-Weverything` warnings globally (in picky mode): - `-Wused-but-marked-unused` (88000+ hits) and `-Wdisabled-macro-expansion` (2600+ hits). Triggered by `typecheck-gcc.h` when building with clang 14+. Maybe there exists a way to fix within that header? Ref: https://discourse.llvm.org/t/removing-wused-but-marked-unused/55310 - `-Wunsafe-buffer-usage`. clang 16+. 7000+ hits. May be useful in theory, but such high volume of hits makes it impractical to review and possibly address. Meant for C++. Ref: https://clang.llvm.org/docs/SafeBuffers.html Ref: https://stackoverflow.com/questions/77017567/how-to-fix-code-to-avoid-warning-wunsafe-buffer-usage Ref: https://discourse.llvm.org/t/rfc-c-buffer-hardening/65734 Ref: https://github.com/llvm/llvm-project/pull/111624 - `-Wimplicit-void-ptr-cast`. clang 21+. 1700+ hits. C++ warning, deemed pure noise. Ref: https://github.com/curl/curl/issues/18470#issuecomment-3253506266 - `-Wswitch-default` (180+ hits), `-Wswitch-enum` (190+ hits), `-Wcovered-switch-default` (20+ hits). Next to impossible to fix cleanly, esp. when the covered `case` branches depend on compile-time options. - `-Wdocumentation-unknown-command` (8+ hits). Triggered in a few sources. Seems arbitrary and bogus. - `-Wpadded` (550+ hits). - `-Wc++-keyword` on Windows, where it collides with `wchar_t`. (100+ hits) Ref: https://github.com/llvm/llvm-project/issues/155988 - `-Wreserved-macro-identifier`. clang 13+. 5+ hits. Sometimes it's necessary to set external macros that use the reserved namespace. E.g. `_CRT_NONSTDC_NO_DEPRECATE`, `__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__`, `__NO_NET_API`, possibly `_REENTRANT`, and more. It's not worth trying to silence them individually. - `-Wnonportable-system-include-path` with `clang-cl`. It'd be broken by doing what the warning suggests. - `-Wformat-non-iso` for clang-cl. CMake `PICKY_COMPILER=ON` (the default) or `./configure` `--enable-warnings` (not the default) is required to enable these silencing rules. Also: - autotools, cmake: fix Apple clang and mainline llvm version translations. Ref: https://en.wikipedia.org/wiki/Xcode#Toolchain_versions - autotools, cmake: enable `-Warray-compare` for clang 20+. Follow-up to4b7accda5a#17196 - cmake: fix to enable `-Wmissing-variable-declarations` at an earlier clang version. - cmake: update internal logic to handle warning options with `+` in them. - cmake: fix internal logic to match the whole option when looking into `CMAKE_C_FLAGS` for custom-disabled warnings. Follow-up tob85cb8cb4e#18485 Closes #18477
250 lines
8.2 KiB
C
250 lines
8.2 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Steve Holme, <steve_holme@hotmail.com>.
|
|
*
|
|
* 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"
|
|
|
|
#ifdef _WIN32
|
|
|
|
#include <curl/curl.h>
|
|
#include "version_win32.h"
|
|
#include "warnless.h"
|
|
|
|
/* The last 2 #include files should be in this order */
|
|
#include "../curl_memory.h"
|
|
#include "../memdebug.h"
|
|
|
|
/* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW)
|
|
and RtlVerifyVersionInfo (RTLOSVERSIONINFOEXW) */
|
|
struct OUR_OSVERSIONINFOEXW {
|
|
ULONG dwOSVersionInfoSize;
|
|
ULONG dwMajorVersion;
|
|
ULONG dwMinorVersion;
|
|
ULONG dwBuildNumber;
|
|
ULONG dwPlatformId;
|
|
WCHAR szCSDVersion[128];
|
|
USHORT wServicePackMajor;
|
|
USHORT wServicePackMinor;
|
|
USHORT wSuiteMask;
|
|
UCHAR wProductType;
|
|
UCHAR wReserved;
|
|
};
|
|
|
|
/*
|
|
* curlx_verify_windows_version()
|
|
*
|
|
* This is used to verify if we are running on a specific Windows version.
|
|
*
|
|
* Parameters:
|
|
*
|
|
* majorVersion [in] - The major version number.
|
|
* minorVersion [in] - The minor version number.
|
|
* buildVersion [in] - The build version number. If 0, this parameter is
|
|
* ignored.
|
|
* platform [in] - The optional platform identifier.
|
|
* condition [in] - The test condition used to specifier whether we are
|
|
* checking a version less than, equal to or greater than
|
|
* what is specified in the major and minor version
|
|
* numbers.
|
|
*
|
|
* Returns TRUE if matched; otherwise FALSE.
|
|
*/
|
|
bool curlx_verify_windows_version(const unsigned int majorVersion,
|
|
const unsigned int minorVersion,
|
|
const unsigned int buildVersion,
|
|
const PlatformIdentifier platform,
|
|
const VersionCondition condition)
|
|
{
|
|
bool matched = FALSE;
|
|
|
|
#ifdef CURL_WINDOWS_UWP
|
|
/* We have no way to determine the Windows version from Windows apps,
|
|
so let's assume we are running on the target Windows version. */
|
|
const WORD fullVersion = MAKEWORD(minorVersion, majorVersion);
|
|
const WORD targetVersion = (WORD)_WIN32_WINNT;
|
|
|
|
(void)buildVersion;
|
|
|
|
switch(condition) {
|
|
case VERSION_LESS_THAN:
|
|
matched = targetVersion < fullVersion;
|
|
break;
|
|
|
|
case VERSION_LESS_THAN_EQUAL:
|
|
matched = targetVersion <= fullVersion;
|
|
break;
|
|
|
|
case VERSION_EQUAL:
|
|
matched = targetVersion == fullVersion;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN_EQUAL:
|
|
matched = targetVersion >= fullVersion;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN:
|
|
matched = targetVersion > fullVersion;
|
|
break;
|
|
}
|
|
|
|
if(matched && (platform == PLATFORM_WINDOWS)) {
|
|
/* we are always running on PLATFORM_WINNT */
|
|
matched = FALSE;
|
|
}
|
|
#elif defined(UNDER_CE)
|
|
(void)majorVersion;
|
|
(void)minorVersion;
|
|
(void)buildVersion;
|
|
(void)platform;
|
|
(void)condition;
|
|
#else
|
|
ULONGLONG cm = 0;
|
|
struct OUR_OSVERSIONINFOEXW osver;
|
|
BYTE majorCondition;
|
|
BYTE minorCondition;
|
|
BYTE buildCondition;
|
|
BYTE spMajorCondition;
|
|
BYTE spMinorCondition;
|
|
DWORD dwTypeMask = VER_MAJORVERSION | VER_MINORVERSION |
|
|
VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR;
|
|
|
|
typedef LONG (APIENTRY *RTLVERIFYVERSIONINFO_FN)
|
|
(struct OUR_OSVERSIONINFOEXW *, ULONG, ULONGLONG);
|
|
static RTLVERIFYVERSIONINFO_FN pRtlVerifyVersionInfo;
|
|
static bool onetime = TRUE; /* safe because first call is during init */
|
|
|
|
if(onetime) {
|
|
#if defined(__clang__) && __clang_major__ >= 16
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wcast-function-type-strict"
|
|
#endif
|
|
pRtlVerifyVersionInfo = CURLX_FUNCTION_CAST(RTLVERIFYVERSIONINFO_FN,
|
|
(GetProcAddress(GetModuleHandleA("ntdll"), "RtlVerifyVersionInfo")));
|
|
#if defined(__clang__) && __clang_major__ >= 16
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
onetime = FALSE;
|
|
}
|
|
|
|
switch(condition) {
|
|
case VERSION_LESS_THAN:
|
|
majorCondition = VER_LESS;
|
|
minorCondition = VER_LESS;
|
|
buildCondition = VER_LESS;
|
|
spMajorCondition = VER_LESS_EQUAL;
|
|
spMinorCondition = VER_LESS_EQUAL;
|
|
break;
|
|
|
|
case VERSION_LESS_THAN_EQUAL:
|
|
majorCondition = VER_LESS_EQUAL;
|
|
minorCondition = VER_LESS_EQUAL;
|
|
buildCondition = VER_LESS_EQUAL;
|
|
spMajorCondition = VER_LESS_EQUAL;
|
|
spMinorCondition = VER_LESS_EQUAL;
|
|
break;
|
|
|
|
case VERSION_EQUAL:
|
|
majorCondition = VER_EQUAL;
|
|
minorCondition = VER_EQUAL;
|
|
buildCondition = VER_EQUAL;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN_EQUAL:
|
|
majorCondition = VER_GREATER_EQUAL;
|
|
minorCondition = VER_GREATER_EQUAL;
|
|
buildCondition = VER_GREATER_EQUAL;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN:
|
|
majorCondition = VER_GREATER;
|
|
minorCondition = VER_GREATER;
|
|
buildCondition = VER_GREATER;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
default:
|
|
return FALSE;
|
|
}
|
|
|
|
memset(&osver, 0, sizeof(osver));
|
|
osver.dwOSVersionInfoSize = sizeof(osver);
|
|
osver.dwMajorVersion = majorVersion;
|
|
osver.dwMinorVersion = minorVersion;
|
|
osver.dwBuildNumber = buildVersion;
|
|
if(platform == PLATFORM_WINDOWS)
|
|
osver.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;
|
|
else if(platform == PLATFORM_WINNT)
|
|
osver.dwPlatformId = VER_PLATFORM_WIN32_NT;
|
|
|
|
cm = VerSetConditionMask(cm, VER_MAJORVERSION, majorCondition);
|
|
cm = VerSetConditionMask(cm, VER_MINORVERSION, minorCondition);
|
|
cm = VerSetConditionMask(cm, VER_SERVICEPACKMAJOR, spMajorCondition);
|
|
cm = VerSetConditionMask(cm, VER_SERVICEPACKMINOR, spMinorCondition);
|
|
|
|
if(platform != PLATFORM_DONT_CARE) {
|
|
cm = VerSetConditionMask(cm, VER_PLATFORMID, VER_EQUAL);
|
|
dwTypeMask |= VER_PLATFORMID;
|
|
}
|
|
|
|
/* Later versions of Windows have version functions that may not return the
|
|
real version of Windows unless the application is so manifested. We prefer
|
|
the real version always, so we use the Rtl variant of the function when
|
|
possible. Note though the function signatures have underlying fundamental
|
|
types that are the same, the return values are different. */
|
|
if(pRtlVerifyVersionInfo)
|
|
matched = !pRtlVerifyVersionInfo(&osver, dwTypeMask, cm);
|
|
else
|
|
matched = !!VerifyVersionInfoW((OSVERSIONINFOEXW *)&osver, dwTypeMask, cm);
|
|
|
|
/* Compare the build number separately. VerifyVersionInfo normally compares
|
|
major.minor in hierarchical order (eg 1.9 is less than 2.0) but does not
|
|
do the same for build (eg 1.9 build 222 is not less than 2.0 build 111).
|
|
Build comparison is only needed when build numbers are equal (eg 1.9 is
|
|
always less than 2.0 so build comparison is not needed). */
|
|
if(matched && buildVersion &&
|
|
(condition == VERSION_EQUAL ||
|
|
((condition == VERSION_GREATER_THAN_EQUAL ||
|
|
condition == VERSION_LESS_THAN_EQUAL) &&
|
|
curlx_verify_windows_version(majorVersion, minorVersion, 0,
|
|
platform, VERSION_EQUAL)))) {
|
|
|
|
cm = VerSetConditionMask(0, VER_BUILDNUMBER, buildCondition);
|
|
dwTypeMask = VER_BUILDNUMBER;
|
|
if(pRtlVerifyVersionInfo)
|
|
matched = !pRtlVerifyVersionInfo(&osver, dwTypeMask, cm);
|
|
else
|
|
matched = !!VerifyVersionInfoW((OSVERSIONINFOEXW *)&osver,
|
|
dwTypeMask, cm);
|
|
}
|
|
|
|
#endif
|
|
|
|
return matched;
|
|
}
|
|
|
|
#endif /* _WIN32 */
|