tidy-up: mostly whitespace nits

- delete completed TODO from `./CMakeLists.txt`.
- convert a C++ comment to C89 in `./CMake/CurlTests.c`.
- delete duplicate EOLs from EOF.
- add missing EOL at EOF.
- delete whitespace at EOL (except from expected test results).
- convert tabs to spaces.
- convert CRLF EOLs to LF in GHA yaml.
- text casing fixes in `./CMakeLists.txt`.
- fix a codespell typo in `packages/OS400/initscript.sh`.

Closes #11772
This commit is contained in:
Viktor Szakats 2023-08-31 13:28:49 +00:00
parent 63f23fafc9
commit ce3dce9015
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
87 changed files with 135 additions and 173 deletions

View File

@ -77,4 +77,3 @@ while(<F>) {
} }
close(F); close(F);
close(O); close(O);

1
.gitignore vendored
View File

@ -65,4 +65,3 @@ curl_fuzzer_seed_corpus.zip
libstandaloneengine.a libstandaloneengine.a
tests/string tests/string
tests/config tests/config

View File

@ -510,7 +510,7 @@ main() {
int int
main() { main() {
_Atomic int i = 1; _Atomic int i = 1;
i = 0; // Force an atomic-write operation. i = 0; /* Force an atomic-write operation. */
return i; return i;
} }
#endif #endif

View File

@ -391,20 +391,19 @@ if(WIN32)
endif() endif()
# check SSL libraries # check SSL libraries
# TODO support GnuTLS
option(CURL_ENABLE_SSL "Enable SSL support" ON) option(CURL_ENABLE_SSL "Enable SSL support" ON)
if(APPLE) if(APPLE)
cmake_dependent_option(CURL_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_SECTRANSP "Enable Apple OS native SSL/TLS" OFF CURL_ENABLE_SSL OFF)
endif() endif()
if(WIN32) if(WIN32)
cmake_dependent_option(CURL_USE_SCHANNEL "enable Windows native SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_SCHANNEL "Enable Windows native SSL/TLS" OFF CURL_ENABLE_SSL OFF)
cmake_dependent_option(CURL_WINDOWS_SSPI "Use windows libraries to allow NTLM authentication without OpenSSL" ON cmake_dependent_option(CURL_WINDOWS_SSPI "Use windows libraries to allow NTLM authentication without OpenSSL" ON
CURL_USE_SCHANNEL OFF) CURL_USE_SCHANNEL OFF)
endif() endif()
cmake_dependent_option(CURL_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF)
cmake_dependent_option(CURL_USE_BEARSSL "Enable BearSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_BEARSSL "Enable BearSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF)
cmake_dependent_option(CURL_USE_WOLFSSL "enable wolfSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_WOLFSSL "Enable wolfSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF)
cmake_dependent_option(CURL_USE_GNUTLS "Enable GNUTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_GNUTLS "Enable GNUTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF)
set(openssl_default ON) set(openssl_default ON)
@ -607,7 +606,7 @@ if(USE_OPENSSL OR USE_WOLFSSL)
endif() endif()
endif() endif()
option(USE_NGHTTP2 "Use Nghttp2 library" OFF) option(USE_NGHTTP2 "Use nghttp2 library" OFF)
if(USE_NGHTTP2) if(USE_NGHTTP2)
find_package(NGHTTP2 REQUIRED) find_package(NGHTTP2 REQUIRED)
include_directories(${NGHTTP2_INCLUDE_DIRS}) include_directories(${NGHTTP2_INCLUDE_DIRS})

View File

@ -66,4 +66,3 @@ Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/
## Sponsors ## Sponsors
Support this project by becoming a [sponsor](https://curl.se/sponsors.html). Support this project by becoming a [sponsor](https://curl.se/sponsors.html).

View File

@ -30,7 +30,6 @@ typedef ssize_t Curl_bufq_reader(void *reader_ctx, unsigned char *buf, size_t le
ssize_t Curl_bufq_slurp(struct bufq *q, Curl_bufq_reader *reader, void *reader_ctx, ssize_t Curl_bufq_slurp(struct bufq *q, Curl_bufq_reader *reader, void *reader_ctx,
CURLcode *err); CURLcode *err);
``` ```
`Curl_bufq_slurp()` will invoke the given `reader` callback, passing it its own internal `Curl_bufq_slurp()` will invoke the given `reader` callback, passing it its own internal
@ -140,5 +139,3 @@ A pool can be shared between many `bufq`s, as long as all of them operate in the
* when all `bufq`s are empty, only memory for `max_spare` chunks in the pool is used. Empty `bufq`s will hold no memory. * when all `bufq`s are empty, only memory for `max_spare` chunks in the pool is used. Empty `bufq`s will hold no memory.
* the latest spare chunk is the first to be handed out again, no matter which `bufq` needs it. This keeps the footprint of "recently used" memory smaller. * the latest spare chunk is the first to be handed out again, no matter which `bufq` needs it. This keeps the footprint of "recently used" memory smaller.

View File

@ -46,4 +46,3 @@ curl will remove the support for space-separated names in July 2024.
- Support for systems without 64 bit data types - Support for systems without 64 bit data types
- NSS - NSS
- gskit - gskit

View File

@ -67,4 +67,3 @@ still need attention and verification include:
- h2 Upgrade: - h2 Upgrade:
- receiving HTTP/1 trailers - receiving HTTP/1 trailers
- sending HTTP/1 trailers - sending HTTP/1 trailers

View File

@ -54,4 +54,3 @@ shows the content URL (percent) encoded.
expands the variable base64 encoded expands the variable base64 encoded
.RE .RE
.IP .IP

View File

@ -60,4 +60,3 @@ int main(void)
#endif #endif
return 0; return 0;
} }

View File

@ -112,4 +112,3 @@ change API, ABI and behavior before this "goes live".
.BR curl_ws_meta "(3), " curl_ws_recv "(3), " curl_ws_send "(3), " .BR curl_ws_meta "(3), " curl_ws_recv "(3), " curl_ws_send "(3), "
.BR curl_easy_init "(3), " CURLOPT_CONNECT_ONLY "(3), " .BR curl_easy_init "(3), " CURLOPT_CONNECT_ONLY "(3), "
.BR CURLOPT_WRITEFUNCTION "(3)" CURLOPT_WS_OPTIONS "(3), " .BR CURLOPT_WRITEFUNCTION "(3)" CURLOPT_WS_OPTIONS "(3), "

View File

@ -86,4 +86,3 @@ This returns CURLE_OK.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR CURLOPT_HSTSREADDATA "(3), " CURLOPT_HSTSWRITEFUNCTION "(3), " .BR CURLOPT_HSTSREADDATA "(3), " CURLOPT_HSTSWRITEFUNCTION "(3), "
.BR CURLOPT_HSTS "(3), " CURLOPT_HSTS_CTRL "(3), " .BR CURLOPT_HSTS "(3), " CURLOPT_HSTS_CTRL "(3), "

View File

@ -80,4 +80,3 @@ Added in 7.62.0
Returns CURLE_OK Returns CURLE_OK
.SH SEE ALSO .SH SEE ALSO
.BR CURLOPT_TCP_KEEPALIVE "(3), " .BR CURLOPT_TCP_KEEPALIVE "(3), "

View File

@ -39,4 +39,3 @@ void Curl_amiga_cleanup(void);
#endif #endif
#endif /* HEADER_CURL_AMIGAOS_H */ #endif /* HEADER_CURL_AMIGAOS_H */

View File

@ -646,4 +646,3 @@ size_t Curl_conn_get_max_concurrent(struct Curl_easy *data,
&n, NULL) : CURLE_UNKNOWN_OPTION; &n, NULL) : CURLE_UNKNOWN_OPTION;
return (result || n <= 0)? 1 : (size_t)n; return (result || n <= 0)? 1 : (size_t)n;
} }

View File

@ -1446,4 +1446,3 @@ CURLcode Curl_conn_setup(struct Curl_easy *data,
out: out:
return result; return result;
} }

View File

@ -421,4 +421,3 @@ CURLcode Curl_read(struct Curl_easy *data, /* transfer */
out: out:
return result; return result;
} }

View File

@ -266,7 +266,7 @@ versioned_copy()
# The `sed' statement works as follows: # The `sed' statement works as follows:
# - Join \nl-separated lines. # - Join \nl-separated lines.
# - Retain only lines that begins with "identifier =". # - Retain only lines that begins with "identifier =".
# - Replace @...@ sustitutions by shell variable references. # - Replace @...@ substitutions by shell variable references.
# - Turn these lines into shell variable assignments. # - Turn these lines into shell variable assignments.
get_make_vars() get_make_vars()

View File

@ -6,4 +6,3 @@ VC*/src/*curl.vcproj.dist
VC*/lib/*curl.vcproj.dist VC*/lib/*curl.vcproj.dist
VC*/src/*curl.vcxproj.dist VC*/src/*curl.vcxproj.dist
VC*/lib/*curl.vcxproj.dist VC*/lib/*curl.vcxproj.dist

View File

@ -45,4 +45,3 @@ ParameterError varexpand(struct GlobalConfig *global,
void varcleanup(struct GlobalConfig *global); void varcleanup(struct GlobalConfig *global);
#endif /* HEADER_CURL_VAR_H */ #endif /* HEADER_CURL_VAR_H */

View File

@ -58,5 +58,3 @@ def pytest_generate_tests(metafunc):
count = int(metafunc.config.getoption("repeat")) count = int(metafunc.config.getoption("repeat"))
metafunc.fixturenames.append('tmp_ct') metafunc.fixturenames.append('tmp_ct')
metafunc.parametrize('repeat', range(count)) metafunc.parametrize('repeat', range(count))

View File

@ -84,4 +84,3 @@ def nghttpx_fwd(env, httpd) -> Optional[Nghttpx]:
assert nghttpx.start() assert nghttpx.start()
yield nghttpx yield nghttpx
nghttpx.stop() nghttpx.stop()

View File

@ -140,5 +140,3 @@ class TestGoAway:
log.debug(f'request {idx} connected') log.debug(f'request {idx} connected')
# this should take `count` seconds to retrieve # this should take `count` seconds to retrieve
assert r.duration >= timedelta(seconds=count) assert r.duration >= timedelta(seconds=count)

View File

@ -108,4 +108,3 @@ class TestErrors:
r.check_response(http_status=200, count=1) r.check_response(http_status=200, count=1)
# check that we did a downgrade # check that we did a downgrade
assert r.stats[0]['http_version'] == '1.1', r.dump_logs() assert r.stats[0]['http_version'] == '1.1', r.dump_logs()

View File

@ -112,4 +112,3 @@ class TestEyeballs:
r.check_response(count=1, http_status=None, exitcode=False) r.check_response(count=1, http_status=None, exitcode=False)
assert r.stats[0]['time_connect'] == 0 # no one should have listened assert r.stats[0]['time_connect'] == 0 # no one should have listened
assert r.stats[0]['time_appconnect'] == 0 # did not happen either assert r.stats[0]['time_appconnect'] == 0 # did not happen either

View File

@ -157,4 +157,3 @@ class TestCaddy:
assert r.total_connects > 1, r.dump_logs() assert r.total_connects > 1, r.dump_logs()
else: else:
assert r.total_connects == 1, r.dump_logs() assert r.total_connects == 1, r.dump_logs()

View File

@ -248,4 +248,3 @@ class TestProxy:
assert r.total_connects == 2 assert r.total_connects == 2
else: else:
assert r.total_connects == 2 assert r.total_connects == 2

View File

@ -157,4 +157,3 @@ class TestProxyAuth:
protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1') protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1')
assert self.get_tunnel_proto_used(r) == 'HTTP/2' \ assert self.get_tunnel_proto_used(r) == 'HTTP/2' \
if tunnel == 'h2' else 'HTTP/1.1' if tunnel == 'h2' else 'HTTP/1.1'

View File

@ -469,4 +469,3 @@ class Env:
pytest.exit(f"`make`in {client_dir} failed:\n{p.stderr}") pytest.exit(f"`make`in {client_dir} failed:\n{p.stderr}")
return False return False
return True return True

View File

@ -256,4 +256,3 @@ class NghttpxFwd(Nghttpx):
time.sleep(.1) time.sleep(.1)
log.error(f"Server still not responding after {timeout}") log.error(f"Server still not responding after {timeout}")
return False return False

View File

@ -45,5 +45,3 @@ def alloc_ports(port_specs: Dict[str, int]) -> Dict[str, int]:
for s in socks: for s in socks:
s.close() s.close()
return ports return ports

View File

@ -686,4 +686,3 @@ lib3100_LDADD = $(TESTUTIL_LIBS)
lib3101_SOURCES = lib3101.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib3101_SOURCES = lib3101.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib3101_LDADD = $(TESTUTIL_LIBS) lib3101_LDADD = $(TESTUTIL_LIBS)

View File

@ -88,4 +88,3 @@ int test(char *URL)
curl_global_cleanup(); curl_global_cleanup();
return (int)res; return (int)res;
} }

View File

@ -65,4 +65,3 @@ test_cleanup:
return ret; return ret;
} }

View File

@ -119,4 +119,3 @@ fail:
curl_global_cleanup(); curl_global_cleanup();
return 0; return 0;
} }