git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

build: disable typecheck via the command-line instead of curl_config.h

Browse Source 
To make it apply to examples. This in turn makes analyzers run quicker
and with fewer false positives.

It's a special disable option, having its effect via `curl/curl.h`.

Bug: https://github.com/curl/curl/pull/20649#issuecomment-3934885021
Follow-up to 9e6f1c5efb #19637

Closes #20650
This commit is contained in:
Viktor Szakats 2026-02-20 15:03:17 +01:00
parent 1eb79cf54b
commit 4b4637a445
No known key found for this signature in database
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -504,6 +504,11 @@ mark_as_advanced(CURL_DISABLE_TYPECHECK)
option(CURL_DISABLE_VERBOSE_STRINGS "Disable verbose strings" OFF)
mark_as_advanced(CURL_DISABLE_VERBOSE_STRINGS)
if(CURL_DISABLE_TYPECHECK)
# Set it via the command-line to make it apply to examples also.
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "CURL_DISABLE_TYPECHECK")
endif()
if(CURL_DISABLE_HTTP)
set(CURL_DISABLE_ALTSVC ON)
set(CURL_DISABLE_HSTS ON)

3
configure.ac
View File

@ -4338,7 +4338,8 @@ AS_HELP_STRING([--disable-typecheck],[Disable type checking]),
[ case "$enableval" in
no)
AC_MSG_RESULT(no)
AC_DEFINE(CURL_DISABLE_TYPECHECK, 1, [to disable type checking])
dnl Set it via the command-line to make it apply to examples also.
CPPFLAGS="$CPPFLAGS -DCURL_DISABLE_TYPECHECK"
curl_typecheck_msg="no"
;;
*)

3
lib/curl_config-cmake.h.in
View File

@ -163,9 +163,6 @@
/* disables TFTP */
#cmakedefine CURL_DISABLE_TFTP 1
/* disables curl_easy_setopt()/curl_easy_getinfo() type checking */
#cmakedefine CURL_DISABLE_TYPECHECK 1
/* disables verbose strings */
#cmakedefine CURL_DISABLE_VERBOSE_STRINGS 1

15
tests/test1165.pl
View File

@ -47,7 +47,9 @@ sub scanconf {
while(<S>) {
if(/(CURL_DISABLE_[A-Z0-9_]+)/g) {
my ($sym)=($1);
$disable{$sym} = 1;
if(not $sym =~ /^(CURL_DISABLE_TYPECHECK)$/) {
$disable{$sym} = 1;
}
}
}
close S;
@ -70,7 +72,7 @@ sub scanconf_cmake {
while(<S>) {
if(/(CURL_DISABLE_[A-Z0-9_]+)/g) {
my ($sym)=($1);
if(not $sym =~ /^(CURL_DISABLE_INSTALL|CURL_DISABLE_SRP)$/) {
if(not $sym =~ /^(CURL_DISABLE_INSTALL|CURL_DISABLE_SRP|CURL_DISABLE_TYPECHECK)$/) {
$hashr->{$sym} = 1;
}
}
@ -86,7 +88,10 @@ sub scan_cmake_config_h {
scanconf_cmake(\%disable_cmake_config_h, "$root/lib/curl_config-cmake.h.in");
}
my %whitelisted = ('CURL_DISABLE_DEPRECATION' => 1);
my %whitelisted = (
'CURL_DISABLE_DEPRECATION' => 1,
'CURL_DISABLE_TYPECHECK' => 1,
);
sub scan_file {
my ($source)=@_;
@ -128,7 +133,9 @@ sub scan_docs {
$line++;
if(/^## `(CURL_DISABLE_[A-Z0-9_]+)`/g) {
my ($sym)=($1);
$docs{$sym} = $line;
if(not $sym =~ /^(CURL_DISABLE_TYPECHECK)$/) {
$docs{$sym} = $line;
}
}
}
close F;