From: Viktor Szakats Date: Wed, 15 Apr 2026 21:57:35 +0000 (+0200) Subject: tidy-up: whitespace X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=032ea65ff2f5bf58f9c0c9e347dee7a850a42baa;p=thirdparty%2Fcurl.git tidy-up: whitespace Closes #21456 --- diff --git a/docs/VERIFY.md b/docs/VERIFY.md index 88c8ef4cbd..de2c8b112e 100644 --- a/docs/VERIFY.md +++ b/docs/VERIFY.md @@ -57,75 +57,75 @@ How do you then verify that what is in git is fine to build a product from? In the curl project we verify the source code in multiple ways, and one way to gain trust is to verify and review our testing procedures. - - we have a consistent code style (invalid style causes errors) +- we have a consistent code style (invalid style causes errors) - - we ban and avoid a number of "sensitive" and "hard-to-use" C functions (use - of such functions causes errors) +- we ban and avoid a number of "sensitive" and "hard-to-use" C functions (use + of such functions causes errors) - - we have a ceiling for complexity in functions to keep them easy to follow, - read and understand (failing to do so causes errors) +- we have a ceiling for complexity in functions to keep them easy to follow, + read and understand (failing to do so causes errors) - - we review all pull requests before merging, both with humans and with bots. We - link back commits to their origin pull requests in commit messages. +- we review all pull requests before merging, both with humans and with bots. We + link back commits to their origin pull requests in commit messages. - - we ban use of "binary blobs" in git to not provide means for malicious - actors to bundle encrypted payloads (trying to include a blob causes errors) +- we ban use of "binary blobs" in git to not provide means for malicious + actors to bundle encrypted payloads (trying to include a blob causes errors) - - we actively avoid base64 encoded chunks as they too could function as ways - to obfuscate malicious contents +- we actively avoid base64 encoded chunks as they too could function as ways + to obfuscate malicious contents - - we ban most uses of UTF-8 in code and documentation to avoid easily mixed - up Unicode characters that look like other characters. (adding Unicode - characters causes errors) +- we ban most uses of UTF-8 in code and documentation to avoid easily mixed + up Unicode characters that look like other characters. (adding Unicode + characters causes errors) - - we document everything to make it clear how things are supposed to work. No - surprises. Lots of documentation is tested and verified in addition to - spellchecks and consistent wording. +- we document everything to make it clear how things are supposed to work. No + surprises. Lots of documentation is tested and verified in addition to + spellchecks and consistent wording. - - we have thousands of tests and we add test cases for (ideally) every - functionality. Finding "white spots" and adding coverage is a top priority. - curl runs on countless operating systems, CPU architectures and you can - build curl in billions of different configuration setups: not every - combination is practically possible to test +- we have thousands of tests and we add test cases for (ideally) every + functionality. Finding "white spots" and adding coverage is a top priority. + curl runs on countless operating systems, CPU architectures and you can + build curl in billions of different configuration setups: not every + combination is practically possible to test - - we build curl and run tests in over two hundred CI jobs that are run for - every commit and every PR. We do not merge commits that have unexplained - test failures. +- we build curl and run tests in over two hundred CI jobs that are run for + every commit and every PR. We do not merge commits that have unexplained + test failures. - - we build curl in CI with the most picky compiler options enabled and we - never allow compiler warnings to linger. We always use `-Werror` that - converts warnings to errors and fail the builds. +- we build curl in CI with the most picky compiler options enabled and we + never allow compiler warnings to linger. We always use `-Werror` that + converts warnings to errors and fail the builds. - - we run all tests using valgrind and several combinations of sanitizers to - find and reduce the risk for memory problems, undefined behavior and - similar +- we run all tests using valgrind and several combinations of sanitizers to + find and reduce the risk for memory problems, undefined behavior and + similar - - we run all tests as "torture tests", where each test case is rerun to have - every invoked fallible function call fail once each, to make sure curl - never leaks memory or crashes due to this. +- we run all tests as "torture tests", where each test case is rerun to have + every invoked fallible function call fail once each, to make sure curl + never leaks memory or crashes due to this. - - we run fuzzing on curl: non-stop as part of Google's OSS-Fuzz project, but - also briefly as part of the CI setup for every commit and PR +- we run fuzzing on curl: non-stop as part of Google's OSS-Fuzz project, but + also briefly as part of the CI setup for every commit and PR - - we make sure that the CI jobs we have for curl never "write back" to curl. - They access the source repository read-only and even if they would be - breached, they cannot infect or taint source code. +- we make sure that the CI jobs we have for curl never "write back" to curl. + They access the source repository read-only and even if they would be + breached, they cannot infect or taint source code. - - we run `zizmor` and other code analyzer tools on the CI job config scripts - to reduce the risk of us running or using insecure CI jobs. +- we run `zizmor` and other code analyzer tools on the CI job config scripts + to reduce the risk of us running or using insecure CI jobs. - - we are committed to always fix reported vulnerabilities in the following - release. Security problems never linger around once they have been - reported. +- we are committed to always fix reported vulnerabilities in the following + release. Security problems never linger around once they have been + reported. - - we document everything and every detail about all curl vulnerabilities ever - reported +- we document everything and every detail about all curl vulnerabilities ever + reported - - our commitment to never breaking ABI or API allows all users to easily - upgrade to new releases. This enables users to run recent security-fixed - versions instead of legacy insecure versions. +- our commitment to never breaking ABI or API allows all users to easily + upgrade to new releases. This enables users to run recent security-fixed + versions instead of legacy insecure versions. - - our code has been audited several times by external security experts, and - the few issues that have been detected in those were immediately addressed +- our code has been audited several times by external security experts, and + the few issues that have been detected in those were immediately addressed - - Two-factor authentication on GitHub is mandatory for all committers +- Two-factor authentication on GitHub is mandatory for all committers diff --git a/lib/hostip.c b/lib/hostip.c index 0eae6b9fb7..85f53c4ef4 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -1102,7 +1102,6 @@ void Curl_resolv_destroy_all(struct Curl_easy *data) #endif /* USE_CURL_ASYNC */ - #ifdef USE_UNIX_SOCKETS CURLcode Curl_resolv_unix(struct Curl_easy *data, const char *unix_path, diff --git a/lib/httpsrr.h b/lib/httpsrr.h index d521f92844..28a790d17f 100644 --- a/lib/httpsrr.h +++ b/lib/httpsrr.h @@ -72,7 +72,6 @@ void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo); bool Curl_httpsrr_applicable(struct Curl_easy *data, const struct Curl_https_rrinfo *rr); - /* * Code points for DNS wire format SvcParams as per RFC 9460 */ @@ -90,7 +89,6 @@ CURLcode Curl_httpsrr_from_ares(const ares_dns_record_t *dnsrec, #endif /* USE_ARES */ #ifdef CURLVERBOSE - CURLcode Curl_httpsrr_print(struct dynbuf *tmp, struct Curl_https_rrinfo *rr); void Curl_httpsrr_trace(struct Curl_easy *data, diff --git a/lib/setopt.c b/lib/setopt.c index 22d32b64a4..b8a632748c 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -1623,7 +1623,6 @@ static CURLcode cookiefile(struct Curl_easy *data, const char *ptr) #endif #ifndef CURL_DISABLE_PROXY - static CURLcode setproxy(struct Curl_easy *data, const char *proxy) { if((data->set.str[STRING_PROXY] && proxy) && @@ -1636,7 +1635,6 @@ static CURLcode setproxy(struct Curl_easy *data, const char *proxy) return Curl_setstropt(&data->set.str[STRING_PROXY], proxy); } - static CURLcode setopt_cptr_proxy(struct Curl_easy *data, CURLoption option, const char *ptr) { diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c index caff664720..6d42b35694 100644 --- a/tests/libtest/lib1560.c +++ b/tests/libtest/lib1560.c @@ -73,7 +73,7 @@ static int checkparts(CURLU *u, const char *in, const char *wanted, /* an IPv6 numerical address host, get the zone */ (void)curl_url_get(u, CURLUPART_ZONEID, &z, getflags); curl_msnprintf(bufp, len, "%s%s%s%s", buf[0] ? " | " : "", p, - z ? " ": "", z ? z : ""); + z ? " " : "", z ? z : ""); } else curl_msnprintf(bufp, len, "%s[%d]", buf[0] ? " | " : "", rc); @@ -217,56 +217,57 @@ static const struct testcase get_parts_list[] = { "http://[fe80::1%25eth0]/", "http | [11] | [12] | [13] | [fe80::1] eth0 | [15] | / | [16] | [17]", 0, 0, CURLUE_OK }, - {"curl.se", - "[10] | [11] | [12] | [13] | curl.se | [15] | / | [16] | [17]", - CURLU_GUESS_SCHEME, CURLU_NO_GUESS_SCHEME, CURLUE_OK}, - {"https://curl.se:0/#", - "https | [11] | [12] | [13] | curl.se | 0 | / | [16] | ", - 0, CURLU_GET_EMPTY, CURLUE_OK}, - {"https://curl.se/#", - "https | [11] | [12] | [13] | curl.se | [15] | / | [16] | ", - 0, CURLU_GET_EMPTY, CURLUE_OK}, - {"https://curl.se/?#", - "https | [11] | [12] | [13] | curl.se | [15] | / | | ", - 0, CURLU_GET_EMPTY, CURLUE_OK}, - {"https://curl.se/?", - "https | [11] | [12] | [13] | curl.se | [15] | / | | [17]", - 0, CURLU_GET_EMPTY, CURLUE_OK}, - {"https://curl.se/?", - "https | [11] | [12] | [13] | curl.se | [15] | / | [16] | [17]", - 0, 0, CURLUE_OK}, - {"https://curl.se/?#", - "https | [11] | [12] | [13] | curl.se | [15] | / | [16] | [17]", - 0, 0, CURLUE_OK}, - {"https://curl.se/# ", - "https | [11] | [12] | [13] | curl.se | [15] | / | [16] | %20%20", - CURLU_URLENCODE | CURLU_ALLOW_SPACE, 0, CURLUE_OK}, - {"", "", 0, 0, CURLUE_MALFORMED_INPUT}, - {" ", "", 0, 0, CURLUE_MALFORMED_INPUT}, - {"1h://example.net", "", 0, 0, CURLUE_BAD_SCHEME}, - {"..://example.net", "", 0, 0, CURLUE_BAD_SCHEME}, - {"-ht://example.net", "", 0, 0, CURLUE_BAD_SCHEME}, - {"+ftp://example.net", "", 0, 0, CURLUE_BAD_SCHEME}, - {"hej.hej://example.net", - "hej.hej | [11] | [12] | [13] | example.net | [15] | / | [16] | [17]", - CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK}, - {"ht-tp://example.net", - "ht-tp | [11] | [12] | [13] | example.net | [15] | / | [16] | [17]", - CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK}, - {"ftp+more://example.net", - "ftp+more | [11] | [12] | [13] | example.net | [15] | / | [16] | [17]", - CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK}, - {"f1337://example.net", - "f1337 | [11] | [12] | [13] | example.net | [15] | / | [16] | [17]", - CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK}, - {"https://user@example.net?hello# space ", - "https | user | [12] | [13] | example.net | [15] | / | hello | %20space%20", - CURLU_ALLOW_SPACE | CURLU_URLENCODE, 0, CURLUE_OK}, - {"https://test%test", "", 0, 0, CURLUE_BAD_HOSTNAME}, - {"https://example.com%252f%40@example.net", - "https | example.com%2f@ | [12] | [13] | example.net | [15] | / " - "| [16] | [17]", - 0, CURLU_URLDECODE, CURLUE_OK }, + { "curl.se", + "[10] | [11] | [12] | [13] | curl.se | [15] | / | [16] | [17]", + CURLU_GUESS_SCHEME, CURLU_NO_GUESS_SCHEME, CURLUE_OK }, + { "https://curl.se:0/#", + "https | [11] | [12] | [13] | curl.se | 0 | / | [16] | ", + 0, CURLU_GET_EMPTY, CURLUE_OK }, + { "https://curl.se/#", + "https | [11] | [12] | [13] | curl.se | [15] | / | [16] | ", + 0, CURLU_GET_EMPTY, CURLUE_OK }, + { "https://curl.se/?#", + "https | [11] | [12] | [13] | curl.se | [15] | / | | ", + 0, CURLU_GET_EMPTY, CURLUE_OK }, + { "https://curl.se/?", + "https | [11] | [12] | [13] | curl.se | [15] | / | | [17]", + 0, CURLU_GET_EMPTY, CURLUE_OK }, + { "https://curl.se/?", + "https | [11] | [12] | [13] | curl.se | [15] | / | [16] | [17]", + 0, 0, CURLUE_OK }, + { "https://curl.se/?#", + "https | [11] | [12] | [13] | curl.se | [15] | / | [16] | [17]", + 0, 0, CURLUE_OK }, + { "https://curl.se/# ", + "https | [11] | [12] | [13] | curl.se | [15] | / | [16] | %20%20", + CURLU_URLENCODE | CURLU_ALLOW_SPACE, 0, CURLUE_OK }, + { "", "", 0, 0, CURLUE_MALFORMED_INPUT }, + { " ", "", 0, 0, CURLUE_MALFORMED_INPUT }, + { "1h://example.net", "", 0, 0, CURLUE_BAD_SCHEME }, + { "..://example.net", "", 0, 0, CURLUE_BAD_SCHEME }, + { "-ht://example.net", "", 0, 0, CURLUE_BAD_SCHEME }, + { "+ftp://example.net", "", 0, 0, CURLUE_BAD_SCHEME }, + { "hej.hej://example.net", + "hej.hej | [11] | [12] | [13] | example.net | [15] | / | [16] | [17]", + CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK }, + { "ht-tp://example.net", + "ht-tp | [11] | [12] | [13] | example.net | [15] | / | [16] | [17]", + CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK }, + { "ftp+more://example.net", + "ftp+more | [11] | [12] | [13] | example.net | [15] | / | [16] | [17]", + CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK }, + { "f1337://example.net", + "f1337 | [11] | [12] | [13] | example.net | [15] | / | [16] | [17]", + CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK }, + { "https://user@example.net?hello# space ", + "https | user | [12] | [13] | example.net | [15] | / | hello | " + "%20space%20", + CURLU_ALLOW_SPACE | CURLU_URLENCODE, 0, CURLUE_OK }, + { "https://test%test", "", 0, 0, CURLUE_BAD_HOSTNAME }, + { "https://example.com%252f%40@example.net", + "https | example.com%2f@ | [12] | [13] | example.net | [15] | / " + "| [16] | [17]", + 0, CURLU_URLDECODE, CURLUE_OK }, #ifdef USE_IDN /* https://sv.wikipedia.org/wiki/R%c3%a4ksm%c3%b6rg%c3%a5s @@ -274,22 +275,22 @@ static const struct testcase get_parts_list[] = { https://codepoints.net/U+00F6 Latin Small Letter O with Diaeresis https://codepoints.net/U+00E5 Latin Small Letter A with Ring Above */ - {"https://r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se", - "https | [11] | [12] | [13] | xn--rksmrgs-5wao1o.se | " - "[15] | / | [16] | [17]", 0, CURLU_PUNYCODE, CURLUE_OK}, - {"https://xn--rksmrgs-5wao1o.se", - "https | [11] | [12] | [13] | r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se | " - "[15] | / | [16] | [17]", 0, CURLU_PUNY2IDN, CURLUE_OK}, - {"https://www.xn--rksmrgs-5wao1o.se", - "https | [11] | [12] | [13] | www.r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se | " - "[15] | / | [16] | [17]", 0, CURLU_PUNY2IDN, CURLUE_OK}, - {"https://www.r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se", - "https | [11] | [12] | [13] | www.r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se | " - "[15] | / | [16] | [17]", 0, CURLU_PUNY2IDN, CURLUE_OK}, + { "https://r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se", + "https | [11] | [12] | [13] | xn--rksmrgs-5wao1o.se | " + "[15] | / | [16] | [17]", 0, CURLU_PUNYCODE, CURLUE_OK }, + { "https://xn--rksmrgs-5wao1o.se", + "https | [11] | [12] | [13] | r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se | " + "[15] | / | [16] | [17]", 0, CURLU_PUNY2IDN, CURLUE_OK }, + { "https://www.xn--rksmrgs-5wao1o.se", + "https | [11] | [12] | [13] | www.r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se | " + "[15] | / | [16] | [17]", 0, CURLU_PUNY2IDN, CURLUE_OK }, + { "https://www.r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se", + "https | [11] | [12] | [13] | www.r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se | " + "[15] | / | [16] | [17]", 0, CURLU_PUNY2IDN, CURLUE_OK }, #else - {"https://r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se", - "https | [11] | [12] | [13] | [30] | [15] | / | [16] | [17]", - 0, CURLU_PUNYCODE, CURLUE_OK}, + { "https://r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se", + "https | [11] | [12] | [13] | [30] | [15] | / | [16] | [17]", + 0, CURLU_PUNYCODE, CURLUE_OK }, #endif /* https://codepoints.net/U+2102 Double-Struck Capital C