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

.github/scripts/cleanspell.pl

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

.gitignore

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

CMake/CurlTests.c

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

CMakeLists.txt

@@ -391,21 +391,20 @@ if(WIN32)
 endif()
 
 # check SSL libraries
-# TODO support GnuTLS
 option(CURL_ENABLE_SSL "Enable SSL support" ON)
 
 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()
 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
     CURL_USE_SCHANNEL OFF)
 endif()
 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_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)
 if(WIN32 OR CURL_USE_SECTRANSP OR CURL_USE_SCHANNEL OR CURL_USE_MBEDTLS OR CURL_USE_WOLFSSL)
@@ -607,7 +606,7 @@ if(USE_OPENSSL OR USE_WOLFSSL)
   endif()
 endif()
 
-option(USE_NGHTTP2 "Use Nghttp2 library" OFF)
+option(USE_NGHTTP2 "Use nghttp2 library" OFF)
 if(USE_NGHTTP2)
   find_package(NGHTTP2 REQUIRED)
   include_directories(${NGHTTP2_INCLUDE_DIRS})

README.md

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

docs/BUFQ.md

@@ -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,
                         CURLcode *err);
-
 ```
 
 `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.
 * 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.
-
-

docs/DEPRECATE.md

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

docs/HTTP3.md

@@ -340,7 +340,7 @@ should be either in your PATH or your current directory.
 Create a `Caddyfile` with the following content:
 ~~~
 localhost:7443 {
-	respond "Hello, world! you are using {http.request.proto}"
+  respond "Hello, world! you are using {http.request.proto}"
 }
 ~~~
 

docs/HYPER.md

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

docs/cmdline-opts/variable.d

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

docs/examples/ipv6.c

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

docs/libcurl/libcurl-ws.3

@@ -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_easy_init "(3), " CURLOPT_CONNECT_ONLY "(3), "
 .BR CURLOPT_WRITEFUNCTION "(3)" CURLOPT_WS_OPTIONS "(3), "
-

docs/libcurl/opts/CURLOPT_HSTSREADFUNCTION.3

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

docs/libcurl/opts/CURLOPT_UPKEEP_INTERVAL_MS.3

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

docs/libcurl/opts/Makefile.inc

@@ -348,7 +348,7 @@ man_MANS =                                      \
   CURLOPT_SSL_CIPHER_LIST.3                     \
   CURLOPT_SSL_CTX_DATA.3                        \
   CURLOPT_SSL_CTX_FUNCTION.3                    \
-  CURLOPT_SSL_EC_CURVES.3			\
+  CURLOPT_SSL_EC_CURVES.3                       \
   CURLOPT_SSL_ENABLE_ALPN.3                     \
   CURLOPT_SSL_ENABLE_NPN.3                      \
   CURLOPT_SSL_FALSESTART.3                      \

lib/amigaos.h

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

lib/cfilters.c

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

lib/connect.c

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

lib/sendf.c

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

m4/curl-bearssl.m4

@@ -49,7 +49,7 @@ if test "x$OPT_BEARSSL" != xno; then
          BEARSSL_ENABLED=1
          USE_BEARSSL="yes"
          ssl_msg="BearSSL"
-	 test bearssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+         test bearssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
         ], [], -lbearssl)
     fi
 

m4/curl-mbedtls.m4

@@ -49,7 +49,7 @@ if test "x$OPT_MBEDTLS" != xno; then
          MBEDTLS_ENABLED=1
          USE_MBEDTLS="yes"
          ssl_msg="mbedTLS"
-	 test mbedtls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+         test mbedtls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
         ], [], -lmbedx509 -lmbedcrypto)
     fi
 

m4/curl-openssl.m4

@@ -226,7 +226,7 @@ if test "x$OPT_OPENSSL" != xno; then
       AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \
                        openssl/pem.h openssl/ssl.h openssl/err.h,
         ssl_msg="OpenSSL"
-	test openssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+        test openssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
         OPENSSL_ENABLED=1
         AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use]))
 

m4/curl-rustls.m4

@@ -57,7 +57,7 @@ if test "x$OPT_RUSTLS" != xno; then
          RUSTLS_ENABLED=1
          USE_RUSTLS="yes"
          ssl_msg="rustls"
-	 test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+         test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
         ], [], -lpthread -ldl -lm)
     fi
 

m4/curl-wolfssl.m4

@@ -90,16 +90,16 @@ if test "x$OPT_WOLFSSL" != xno; then
 
       AC_MSG_CHECKING([for wolfSSL_Init in -lwolfssl])
       AC_LINK_IFELSE([
-	AC_LANG_PROGRAM([[
+        AC_LANG_PROGRAM([[
 /* These aren't needed for detection and confuse WolfSSL.
    They are set up properly later if it is detected.  */
 #undef SIZEOF_LONG
 #undef SIZEOF_LONG_LONG
 #include <wolfssl/options.h>
 #include <wolfssl/ssl.h>
-	]],[[
+        ]],[[
-	  return wolfSSL_Init();
+          return wolfSSL_Init();
-	]])
+        ]])
       ],[
          AC_MSG_RESULT(yes)
          AC_DEFINE(USE_WOLFSSL, 1, [if wolfSSL is enabled])
@@ -107,7 +107,7 @@ if test "x$OPT_WOLFSSL" != xno; then
          WOLFSSL_ENABLED=1
          USE_WOLFSSL="yes"
          ssl_msg="WolfSSL"
-	 test wolfssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+         test wolfssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
        ],
        [
          AC_MSG_RESULT(no)

packages/OS400/initscript.sh

@@ -266,7 +266,7 @@ versioned_copy()
 #       The `sed' statement works as follows:
 #       - Join \nl-separated lines.
 #       - 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.
 
 get_make_vars()

projects/Windows/.gitignore

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

src/var.h

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

tests/conftest.py

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

tests/convsrctest.pl

@@ -154,20 +154,20 @@ sub generate_c {
         elsif(! $seen_return) {
             if(/CURLOPT_URL/) {
                 # URL is passed in as argument or by global
-		my $var = shift @urlvars;
+                my $var = shift @urlvars;
                 s/\"[^\"]*\"/$var/;
             }
-	    s/\bhnd\b/curl/;
+            s/\bhnd\b/curl/;
             # Convert to macro wrapper
             s/curl_easy_setopt/test_setopt/;
-	    if(/curl_easy_perform/) {
+            if(/curl_easy_perform/) {
-		s/\bret\b/res/;
+                s/\bret\b/res/;
-		push @code, $_;
+                push @code, $_;
-		push @code, "test_cleanup:\n";
+                push @code, "test_cleanup:\n";
-	    }
+            }
-	    else {
+            else {
-		push @code, $_;
+                push @code, $_;
-	    }
+            }
         }
     }
 

tests/ftpserver.pl

@@ -1820,7 +1820,7 @@ sub LIST_pop3 {
     # This is a built-in fake-message list
     my @data = (
         "1 100\r\n",
-        "2 4294967400\r\n",	# > 4 GB
+        "2 4294967400\r\n",  # > 4 GB
         "3 200\r\n",
     );
 

tests/http/conftest.py

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

tests/http/test_03_goaway.py

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

tests/http/test_05_errors.py

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

tests/http/test_06_eyeballs.py

@@ -112,4 +112,3 @@ class TestEyeballs:
         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_appconnect'] == 0  # did not happen either
-

tests/http/test_08_caddy.py

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

tests/http/test_10_proxy.py

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

tests/http/test_13_proxy_auth.py

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

tests/http/testenv/env.py

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

tests/http/testenv/nghttpx.py

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

tests/http/testenv/ports.py

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

tests/libtest/Makefile.inc

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

tests/libtest/lib1662.c

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

tests/libtest/lib3010.c

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

tests/libtest/lib677.c

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

winbuild/gen_resp_file.bat

@@ -28,7 +28,7 @@ if exist %OUTFILE% (
 )
 
 echo %MACRO_NAME% = \> %OUTFILE%
-for %%i in (%*) do echo		%DIROBJ%/%%i \>>  %OUTFILE%
+for %%i in (%*) do echo		%DIROBJ%/%%i \>> %OUTFILE%
-echo. >>  %OUTFILE%
+echo. >> %OUTFILE%
 
 :END