tidy-up: miscellaneous

- examples: sync debug output printf masks.
- INSTALL-CMAKE.md: tidy up section for some options.
- curl_sha512_256: delete comment suggesting an optimization.
- vtls/keylog: scope a variable.
- vtls/openssl: make a source code URL a permalink.
- vtls/schannel: drop redundant parentheses.
- test1119.pl: robustify `$1` -> `$s`.
- sync arg names in comments to match the code.
- tidy up and minor fixes to comments.
- fix formatting/indenting/comment/newline/include nits.
- move `UNITTEST` protos next to definitions, sync their argument names.
- make variables static.
- add parentheses to Perl `open()` calls.
- drop unnecessary double quotes in Perl.
- clang-format.

Closes #21000

.clang-tidy.yml

@@ -8,7 +8,7 @@
 Checks:
   - clang-analyzer-*
   - -clang-analyzer-optin.performance.Padding
-  - -clang-analyzer-security.ArrayBound  # due to false positives with clang-tidy v21.1.0
+  - -clang-analyzer-security.ArrayBound  # due to false positives with clang-tidy v21.1.0+
   - -clang-analyzer-security.insecureAPI.bzero  # for FD_ZERO() (seen on macOS)
   - -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling
   - -clang-diagnostic-nullability-extension

.github/workflows/http3-linux.yml

@@ -427,7 +427,8 @@ jobs:
           - name: 'openssl4'
             install_steps: skipall
             LDFLAGS: -Wl,-rpath,/home/runner/openssl4/build/lib
-            PKG_CONFIG_PATH: "/home/runner/openssl4/build/lib/pkgconfig:\
+            PKG_CONFIG_PATH: "\
+              /home/runner/openssl4/build/lib/pkgconfig:\
               /home/runner/nghttp3/build/lib/pkgconfig:\
               /home/runner/nghttp2-openssl4/build/lib/pkgconfig"
             configure: >-
@@ -435,7 +436,8 @@ jobs:
 
           - name: 'openssl4'
             tflags: '--min=1640'
-            PKG_CONFIG_PATH: "/home/runner/openssl4/build/lib/pkgconfig:\
+            PKG_CONFIG_PATH: "\
+              /home/runner/openssl4/build/lib/pkgconfig:\
               /home/runner/nghttp3/build/lib/pkgconfig:\
               /home/runner/ngtcp2-openssl4/build/lib/pkgconfig:\
               /home/runner/nghttp2/build/lib/pkgconfig"
@@ -483,7 +485,8 @@ jobs:
 
           - name: 'boringssl'
             tflags: '--min=1790'
-            PKG_CONFIG_PATH: "/home/runner/boringssl/build/lib/pkgconfig:\
+            PKG_CONFIG_PATH: "\
+              /home/runner/boringssl/build/lib/pkgconfig:\
               /home/runner/nghttp3/build/lib/pkgconfig:\
               /home/runner/ngtcp2-boringssl/build/lib/pkgconfig:\
               /home/runner/nghttp2/build/lib/pkgconfig"
@@ -503,7 +506,8 @@ jobs:
             install_packages: libp11-kit-dev libssh-dev
             tflags: '--min=1840'
             LDFLAGS: -Wl,-rpath,/home/runner/gnutls/build/lib
-            PKG_CONFIG_PATH: "/home/runner/nettle/build/lib64/pkgconfig:\
+            PKG_CONFIG_PATH: "\
+              /home/runner/nettle/build/lib64/pkgconfig:\
               /home/runner/gnutls/build/lib/pkgconfig:\
               /home/runner/nghttp3/build/lib/pkgconfig:\
               /home/runner/ngtcp2/build/lib/pkgconfig:\

.github/workflows/linux.yml

@@ -309,7 +309,8 @@ jobs:
               -Wl,-rpath,/home/runner/rustls/lib
               -Wl,-rpath,/home/linuxbrew/.linuxbrew/opt/gsasl/lib
 
-            PKG_CONFIG_PATH: "/home/runner/wolfssl-opensslextra/lib/pkgconfig:\
+            PKG_CONFIG_PATH: "\
+              /home/runner/wolfssl-opensslextra/lib/pkgconfig:\
               /home/runner/mbedtls/lib/pkgconfig:\
               /home/runner/rustls/lib/pkgconfig:\
               /home/linuxbrew/.linuxbrew/opt/gsasl/lib/pkgconfig"
@@ -330,7 +331,8 @@ jobs:
               -Wl,-rpath,/home/linuxbrew/.linuxbrew/opt/libnghttp3/lib
               -Wl,-rpath,/home/linuxbrew/.linuxbrew/opt/c-ares/lib
 
-            PKG_CONFIG_PATH: "/home/linuxbrew/.linuxbrew/opt/libngtcp2/lib/pkgconfig:\
+            PKG_CONFIG_PATH: "\
+              /home/linuxbrew/.linuxbrew/opt/libngtcp2/lib/pkgconfig:\
               /home/linuxbrew/.linuxbrew/opt/libnghttp3/lib/pkgconfig:\
               /home/linuxbrew/.linuxbrew/opt/c-ares/lib/pkgconfig"
             generate: >-
@@ -354,7 +356,8 @@ jobs:
             CC: clang-20
             CFLAGS: -fsanitize=address,undefined,signed-integer-overflow -fno-sanitize-recover=undefined,integer -Wformat -Werror=format-security -Werror=array-bounds -g
             LDFLAGS: -fsanitize=address,undefined -fno-sanitize-recover=undefined,integer -ldl -lubsan -Wl,-rpath,/home/linuxbrew/.linuxbrew/opt/c-ares/lib
-            PKG_CONFIG_PATH: "/home/linuxbrew/.linuxbrew/opt/libssh2/lib/pkgconfig:\
+            PKG_CONFIG_PATH: "\
+              /home/linuxbrew/.linuxbrew/opt/libssh2/lib/pkgconfig:\
               /home/linuxbrew/.linuxbrew/opt/libngtcp2/lib/pkgconfig:\
               /home/linuxbrew/.linuxbrew/opt/libnghttp3/lib/pkgconfig:\
               /home/linuxbrew/.linuxbrew/opt/c-ares/lib/pkgconfig"

CMake/PickyWarnings.cmake

@@ -350,7 +350,7 @@ if(PICKY_COMPILER)
       endif()
     endif()
 
-    #
+    # Assemble list of flags
 
     set(_picky_skipped "")
     foreach(_ccopt IN LISTS _picky_enable)

docs/INSTALL-CMAKE.md

@@ -247,7 +247,7 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
 - `SHARE_LIB_OBJECT`:                       Build shared and static libcurl in a single pass (requires CMake 3.12 or newer). Default: `ON` for Windows
 - `STATIC_LIB_SUFFIX`:                      Static library suffix. Default: (empty)
 
-## CA bundle options
+## Root CA options
 
 - `CURL_CA_BUNDLE`:                         Absolute path to the CA bundle. Set `none` to disable or `auto` for auto-detection. Default: `auto`
 - `CURL_CA_EMBED`:                          Absolute path to the CA bundle to embed in the curl tool. Default: (disabled)
@@ -257,6 +257,7 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
 - `CURL_CA_PATH`:                           Absolute path to a directory containing CA certificates stored individually.
                                             Set `none` to disable or `auto` for auto-detection. Default: `auto`
 - `CURL_CA_SEARCH_SAFE`:                    Enable safe CA bundle search (within the curl tool directory) on Windows. Default: `OFF`
+- `USE_APPLE_SECTRUST`:                     Use Apple OS-native certificate verification. Default: `OFF`
 
 ## Enabling features
 
@@ -267,9 +268,12 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
 - `ENABLE_THREADED_RESOLVER`:               Enable threaded DNS lookup. Default: `ON` if c-ares is not enabled and target supports threading.
 - `ENABLE_UNICODE`:                         Use the Unicode version of the Windows API functions. Default: `OFF`
 - `ENABLE_UNIX_SOCKETS`:                    Enable Unix domain sockets support. Default: `ON`
+- `USE_APPLE_IDN`:                          Use Apple built-in IDN support. Default: `OFF`
 - `USE_ECH`:                                Enable ECH support. Default: `OFF`
 - `USE_HTTPSRR`:                            Enable HTTPS RR support. Default: `OFF`
 - `USE_SSLS_EXPORT`:                        Enable experimental SSL session import/export. Default: `OFF`
+- `USE_WIN32_IDN`:                          Use WinIDN for IDN support. Default: `OFF`
+- `USE_WIN32_LDAP`:                         Use Windows LDAP implementation. Default: `ON`
 
 ## Disabling features
 
@@ -369,14 +373,10 @@ Details via CMake
 - `CURL_ZLIB`:                              Use zlib (`ON`, `OFF` or `AUTO`). Default: `AUTO`
 - `CURL_ZSTD`:                              Use zstd (`ON`, `OFF` or `AUTO`). Default: `AUTO`
 - `ENABLE_ARES`:                            Enable c-ares support. Default: `OFF`
-- `USE_APPLE_IDN`:                          Use Apple built-in IDN support. Default: `OFF`
-- `USE_APPLE_SECTRUST`:                     Use Apple OS-native certificate verification. Default: `OFF`
 - `USE_LIBIDN2`:                            Use libidn2 for IDN support. Default: `ON`
 - `USE_NGHTTP2`:                            Use nghttp2 library. Default: `ON`
 - `USE_NGTCP2`:                             Use ngtcp2 and nghttp3 libraries for HTTP/3 support. Default: `OFF`
 - `USE_QUICHE`:                             Use quiche library for HTTP/3 support. Default: `OFF`
-- `USE_WIN32_IDN`:                          Use WinIDN for IDN support. Default: `OFF`
-- `USE_WIN32_LDAP`:                         Use Windows LDAP implementation. Default: `ON`
 
 ## Dependency options (via CMake)
 

docs/examples/debug.c

@@ -45,7 +45,7 @@ static void dump(const char *text, const unsigned char *ptr,
     /* without the hex output, we can fit more on screen */
     width = 0x40;
 
-  fprintf(stderr, "%s, %10.10lu bytes (0x%8.8lx)\n",
+  fprintf(stderr, "%s, %lu bytes (0x%lx)\n",
           text, (unsigned long)size, (unsigned long)size);
 
   for(i = 0; i < size; i += width) {

docs/examples/multi-debugcallback.c

@@ -42,7 +42,7 @@ static void dump(const char *text, const unsigned char *ptr,
     /* without the hex output, we can fit more on screen */
     width = 0x40;
 
-  fprintf(stderr, "%s, %10.10lu bytes (0x%8.8lx)\n",
+  fprintf(stderr, "%s, %lu bytes (0x%lx)\n",
           text, (unsigned long)size, (unsigned long)size);
 
   for(i = 0; i < size; i += width) {

docs/libcurl/opts/CURLOPT_DEBUGFUNCTION.md

@@ -118,7 +118,7 @@ static void dump(const char *text,
   size_t c;
   unsigned int width = 0x10;
 
-  fprintf(stream, "%s, %10.10ld bytes (0x%8.8lx)\n",
+  fprintf(stream, "%s, %lu bytes (0x%lx)\n",
           text, (long)size, (long)size);
 
   for(i = 0; i < size; i += width) {

lib/asyn-ares.c

@@ -349,9 +349,10 @@ static timediff_t async_ares_poll_timeout(struct async_ares_ctx *ares,
     return 1000;
 }
 
-static const struct Curl_addrinfo *
+static const struct Curl_addrinfo *async_ares_get_ai(
-async_ares_get_ai(const struct Curl_addrinfo *ai,
+  const struct Curl_addrinfo *ai,
-                  int ai_family, unsigned int index)
+  int ai_family,
+  unsigned int index)
 {
   unsigned int i = 0;
   for(i = 0; ai; ai = ai->ai_next) {
@@ -364,10 +365,10 @@ async_ares_get_ai(const struct Curl_addrinfo *ai,
   return NULL;
 }
 
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_async_get_ai(struct Curl_easy *data,
-Curl_async_get_ai(struct Curl_easy *data,
                                               struct Curl_resolv_async *async,
-                  int ai_family, unsigned int index)
+                                              int ai_family,
+                                              unsigned int index)
 {
   struct async_ares_ctx *ares = &async->ares;
 
@@ -388,8 +389,8 @@ Curl_async_get_ai(struct Curl_easy *data,
 }
 
 #ifdef USE_HTTPSRR
-const struct Curl_https_rrinfo *
+const struct Curl_https_rrinfo *Curl_async_get_https(
-Curl_async_get_https(struct Curl_easy *data,
+  struct Curl_easy *data,
   struct Curl_resolv_async *async)
 {
   if(Curl_async_knows_https(data, async))
@@ -415,7 +416,7 @@ bool Curl_async_knows_https(struct Curl_easy *data,
  * Waits for a resolve to finish. This function should be avoided since using
  * this risk getting the multi interface to "hang".
  *
- * 'entry' MUST be non-NULL.
+ * 'pdns' MUST be non-NULL.
  *
  * Returns CURLE_COULDNT_RESOLVE_HOST if the host was not resolved,
  * CURLE_OPERATION_TIMEDOUT if a time-out occurred, or other errors.
@@ -479,8 +480,8 @@ CURLcode Curl_async_await(struct Curl_easy *data, uint32_t resolv_id,
  * async_ares_node2addr() converts an address list provided by c-ares
  * to an internal libcurl compatible list.
  */
-static struct Curl_addrinfo *
+static struct Curl_addrinfo *async_ares_node2addr(
-async_ares_node2addr(struct ares_addrinfo_node *node)
+  struct ares_addrinfo_node *node)
 {
   /* traverse the ares_addrinfo_node list */
   struct ares_addrinfo_node *ai;

lib/asyn-thrdd.c

@@ -135,8 +135,8 @@ static void async_thrdd_item_destroy(struct async_thrdd_item *item)
 }
 
 /* Initialize context for threaded resolver */
-static struct async_thrdd_item *
+static struct async_thrdd_item *async_thrdd_item_create(
-async_thrdd_item_create(struct Curl_easy *data,
+  struct Curl_easy *data,
   uint32_t resolv_id, uint8_t dns_queries,
   const char *hostname, uint16_t port,
   uint8_t transport)
@@ -496,8 +496,7 @@ static void async_thrdd_report_item(struct Curl_easy *data,
     }
   }
 
-  infof(data, "Host %s:%u resolved IPv%c: %s",
+  infof(data, "Host %s:%u resolved IPv%c: %s", item->hostname, item->port,
-               item->hostname, item->port,
         (item->dns_queries & CURL_DNSQ_AAAA) ? '6' : '4',
         (curlx_dyn_len(&tmp) ? curlx_dyn_ptr(&tmp) : "(none)"));
 out:
@@ -758,8 +757,8 @@ out:
   return result;
 }
 
-static const struct Curl_addrinfo *
+static const struct Curl_addrinfo *async_thrdd_get_ai(
-async_thrdd_get_ai(const struct Curl_addrinfo *ai,
+  const struct Curl_addrinfo *ai,
   int ai_family, unsigned int index)
 {
   unsigned int i = 0;
@@ -773,10 +772,10 @@ async_thrdd_get_ai(const struct Curl_addrinfo *ai,
   return NULL;
 }
 
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_async_get_ai(struct Curl_easy *data,
-Curl_async_get_ai(struct Curl_easy *data,
                                               struct Curl_resolv_async *async,
-                  int ai_family, unsigned int index)
+                                              int ai_family,
+                                              unsigned int index)
 {
   struct async_thrdd_ctx *thrdd = &async->thrdd;
 
@@ -797,8 +796,8 @@ Curl_async_get_ai(struct Curl_easy *data,
 }
 
 #ifdef USE_HTTPSRR
-const struct Curl_https_rrinfo *
+const struct Curl_https_rrinfo *Curl_async_get_https(
-Curl_async_get_https(struct Curl_easy *data,
+  struct Curl_easy *data,
   struct Curl_resolv_async *async)
 {
 #ifdef USE_HTTPSRR_ARES

lib/asyn.h

@@ -82,14 +82,14 @@ void Curl_async_global_cleanup(void);
 CURLcode Curl_async_getaddrinfo(struct Curl_easy *data,
                                 struct Curl_resolv_async *async);
 
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_async_get_ai(struct Curl_easy *data,
-Curl_async_get_ai(struct Curl_easy *data,
                                               struct Curl_resolv_async *async,
-                  int ai_family, unsigned int index);
+                                              int ai_family,
+                                              unsigned int index);
 
 #ifdef USE_HTTPSRR
-const struct Curl_https_rrinfo *
+const struct Curl_https_rrinfo *Curl_async_get_https(
-Curl_async_get_https(struct Curl_easy *data,
+  struct Curl_easy *data,
   struct Curl_resolv_async *async);
 bool Curl_async_knows_https(struct Curl_easy *data,
                             struct Curl_resolv_async *async);
@@ -176,7 +176,7 @@ struct doh_probes;
  * Waits for a resolve to finish. This function should be avoided since using
  * this risk getting the multi interface to "hang".
  *
- * On return 'entry' is assigned the resolved dns (CURLE_OK or NULL otherwise.
+ * On return 'dns' is assigned the resolved dns (CURLE_OK or NULL otherwise.
  *
  * Returns CURLE_COULDNT_RESOLVE_HOST if the host was not resolved,
  * CURLE_OPERATION_TIMEDOUT if a time-out occurred, or other errors.
@@ -210,8 +210,8 @@ CURLcode Curl_async_pollset(struct Curl_easy *data,
 /* convert these functions if an asynch resolver is not used */
 #define Curl_async_global_init()        CURLE_OK
 #define Curl_async_global_cleanup()     Curl_nop_stmt
-#define Curl_async_get_ai(a,b,c,d)      NULL
+#define Curl_async_get_ai(a, b, c, d)   NULL
-#define Curl_async_await(a,b,c)         CURLE_COULDNT_RESOLVE_HOST
+#define Curl_async_await(a, b, c)       CURLE_COULDNT_RESOLVE_HOST
 #define Curl_async_take_result(x, y, z) CURLE_COULDNT_RESOLVE_HOST
 #define Curl_async_pollset(x, y, z)     CURLE_OK
 #endif /* !CURLRES_ASYNCH */
@@ -263,7 +263,7 @@ void Curl_async_destroy(struct Curl_easy *data,
                         struct Curl_resolv_async *async);
 
 #else /* !USE_CURL_ASYNC */
-#define Curl_async_shutdown(x,y) Curl_nop_stmt
+#define Curl_async_shutdown(x, y) Curl_nop_stmt
 #endif /* USE_CURL_ASYNC */
 
 /********** end of generic resolver interface functions *****************/

lib/cf-dns.c

@@ -47,9 +47,10 @@ struct cf_dns_ctx {
   char hostname[1];
 };
 
-static struct cf_dns_ctx *
+static struct cf_dns_ctx *cf_dns_ctx_create(struct Curl_easy *data,
-cf_dns_ctx_create(struct Curl_easy *data, uint8_t dns_queries,
+                                            uint8_t dns_queries,
-                  const char *hostname, uint16_t port, uint8_t transport,
+                                            const char *hostname,
+                                            uint16_t port, uint8_t transport,
                                             bool abstract_unix_socket,
                                             struct Curl_dns_entry *dns)
 {
@@ -500,8 +501,9 @@ CURLcode Curl_conn_dns_result(struct connectdata *conn, int sockindex)
   return Curl_cf_dns_result(conn->cfilter[sockindex]);
 }
 
-static const struct Curl_addrinfo *
+static const struct Curl_addrinfo *cf_dns_get_nth_ai(
-cf_dns_get_nth_ai(struct Curl_cfilter *cf, const struct Curl_addrinfo *ai,
+  struct Curl_cfilter *cf,
+  const struct Curl_addrinfo *ai,
   int ai_family, unsigned int index)
 {
   struct cf_dns_ctx *ctx = cf->ctx;
@@ -551,8 +553,7 @@ bool Curl_conn_dns_has_any_ai(struct Curl_easy *data, int sockindex)
  * first "resolve" filter underneath `cf`. If the DNS resolving is
  * not done yet or if no address for the family exists, returns NULL.
  */
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_cf_dns_get_ai(struct Curl_cfilter *cf,
-Curl_cf_dns_get_ai(struct Curl_cfilter *cf,
                                                struct Curl_easy *data,
                                                int ai_family,
                                                unsigned int index)
@@ -576,15 +577,12 @@ Curl_cf_dns_get_ai(struct Curl_cfilter *cf,
  * first "resolve" filter at the connection. If the DNS resolving is
  * not done yet or if no address for the family exists, returns NULL.
  */
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_conn_dns_get_ai(struct Curl_easy *data,
-Curl_conn_dns_get_ai(struct Curl_easy *data,
+                                                 int sockindex, int ai_family,
-                     int sockindex,
-                     int ai_family,
                                                  unsigned int index)
 {
   struct connectdata *conn = data->conn;
-  return Curl_cf_dns_get_ai(conn->cfilter[sockindex], data,
+  return Curl_cf_dns_get_ai(conn->cfilter[sockindex], data, ai_family, index);
-                               ai_family, index);
 }
 
 #ifdef USE_HTTPSRR
@@ -592,8 +590,8 @@ Curl_conn_dns_get_ai(struct Curl_easy *data,
  * connection. If the DNS resolving is not done yet or if there
  * is no HTTPS-RR info, returns NULL.
  */
-const struct Curl_https_rrinfo *
+const struct Curl_https_rrinfo *Curl_conn_dns_get_https(struct Curl_easy *data,
-Curl_conn_dns_get_https(struct Curl_easy *data, int sockindex)
+                                                        int sockindex)
 {
   struct Curl_cfilter *cf = data->conn->cfilter[sockindex];
   for(; cf; cf = cf->next) {

lib/cf-dns.h

@@ -51,28 +51,25 @@ CURLcode Curl_cf_dns_result(struct Curl_cfilter *cf);
  * `Curl_conn_dns_get_ai()`. */
 bool Curl_conn_dns_has_any_ai(struct Curl_easy *data, int sockindex);
 
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_conn_dns_get_ai(struct Curl_easy *data,
-Curl_conn_dns_get_ai(struct Curl_easy *data,
                                                  int sockindex,
                                                  int ai_family,
                                                  unsigned int index);
 
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_cf_dns_get_ai(struct Curl_cfilter *cf,
-Curl_cf_dns_get_ai(struct Curl_cfilter *cf,
                                                struct Curl_easy *data,
                                                int ai_family,
                                                unsigned int index);
 
 #ifdef USE_HTTPSRR
-const struct Curl_https_rrinfo *
+const struct Curl_https_rrinfo *Curl_conn_dns_get_https(struct Curl_easy *data,
-Curl_conn_dns_get_https(struct Curl_easy *data, int sockindex);
+                                                        int sockindex);
 bool Curl_conn_dns_resolved_https(struct Curl_easy *data, int sockindex);
 #else
-#define Curl_conn_dns_get_https(a,b)         NULL
+#define Curl_conn_dns_get_https(a, b)        NULL
-#define Curl_conn_dns_resolved_https(a,b)    TRUE
+#define Curl_conn_dns_resolved_https(a, b)   TRUE
 #endif
 
-
 extern struct Curl_cftype Curl_cft_dns;
 
 #endif /* HEADER_CURL_CF_DNS_H */

lib/cf-h2-proxy.c

@@ -685,7 +685,8 @@ static int proxy_h2_on_stream_close(nghttp2_session *session,
   return 0;
 }
 
-static CURLcode proxy_h2_submit(int32_t *pstream_id,
+static CURLcode proxy_h2_submit(
+  int32_t *pstream_id,
   struct Curl_cfilter *cf,
   struct Curl_easy *data,
   nghttp2_session *h2,

lib/cf-ip-happy.c

@@ -123,8 +123,7 @@ static void cf_ai_iter_init(struct cf_ai_iter *iter,
   iter->n = 0;
 }
 
-static const struct Curl_addrinfo *
+static const struct Curl_addrinfo *cf_ai_iter_next(struct cf_ai_iter *iter,
-cf_ai_iter_next(struct cf_ai_iter *iter,
                                                    struct Curl_easy *data)
 {
   const struct Curl_addrinfo *addr;

lib/cf-socket.c

@@ -638,7 +638,7 @@ static CURLcode bindlocal(struct Curl_easy *data, struct connectdata *conn,
        * to take a type parameter instead.
        */
       uint8_t dns_queries = (af == AF_INET) ?
-                            CURL_DNSQ_A : (CURL_DNSQ_A|CURL_DNSQ_AAAA);
+                            CURL_DNSQ_A : (CURL_DNSQ_A | CURL_DNSQ_AAAA);
 #ifdef USE_IPV6
       if(af == AF_INET6)
         dns_queries = CURL_DNSQ_AAAA;

lib/config-os400.h

@@ -30,7 +30,6 @@
 
 #pragma enum(int)
 
-
 /* ---------------------------------------------------------------- */
 /* Global configuration parameters: normally generated by autoconf. */
 /* ---------------------------------------------------------------- */

lib/cookie.c

@@ -423,8 +423,8 @@ static CURLcode storecookie(struct Cookie *co, struct Curl_str *cp,
 
 /* this function return errors on OOM etc, not on plain cookie format
    problems */
-static CURLcode
+static CURLcode parse_cookie_header(
-parse_cookie_header(struct Curl_easy *data,
+  struct Curl_easy *data,
   struct Cookie *co,
   struct CookieInfo *ci,
   bool *okay,         /* if the cookie was fine */
@@ -433,8 +433,7 @@ parse_cookie_header(struct Curl_easy *data,
   const char *path,   /* full path used when this cookie is
                          set, used to get default path for
                          the cookie unless set */
-                    bool secure)  /* TRUE if connection is over secure
+  bool secure)        /* TRUE if connection is over secure origin */
-                                     origin */
 {
   /* This line was read off an HTTP-header */
   time_t now = 0;
@@ -930,16 +929,15 @@ static bool replace_existing(struct Curl_easy *data,
  * IPv6 address.
  *
  */
-CURLcode
+CURLcode Curl_cookie_add(
-Curl_cookie_add(struct Curl_easy *data,
+  struct Curl_easy *data,
   struct CookieInfo *ci,
   bool httpheader,     /* TRUE if HTTP header-style line */
   bool noexpire,       /* if TRUE, skip remove_expired() */
   const char *lineptr, /* first character of the line */
   const char *domain,  /* default domain */
-                const char *path,   /* full path used when this cookie is set,
+  const char *path,    /* full path used when this cookie is set, used
-                                       used to get default path for the cookie
+                          to get default path for the cookie unless set */
-                                       unless set */
   bool secure)         /* TRUE if connection is over secure origin */
 {
   struct Cookie comem;

lib/curl_ctype.h

@@ -44,8 +44,8 @@
 #define ISDIGIT(x)  (((x) >= '0') && ((x) <= '9'))
 #define ISBLANK(x)  (((x) == ' ') || ((x) == '\t'))
 #define ISSPACE(x)  (ISBLANK(x) || (((x) >= 0xa) && ((x) <= 0x0d)))
-#define ISURLPUNTCS(x) (((x) == '-') || ((x) == '.') || ((x) == '_') || \
+#define ISURLPUNTCS(x)                                           \
-                        ((x) == '~'))
+  (((x) == '-') || ((x) == '.') || ((x) == '_') || ((x) == '~'))
 #define ISUNRESERVED(x) (ISALNUM(x) || ISURLPUNTCS(x))
 #define ISNEWLINE(x)    (((x) == '\n') || (x) == '\r')
 

lib/curl_gssapi.c

@@ -93,8 +93,8 @@ struct stub_gss_ctx_id_t_desc {
   char creds[250];
 };
 
-static OM_uint32
+static OM_uint32 stub_gss_init_sec_context(
-stub_gss_init_sec_context(OM_uint32 *min,
+  OM_uint32 *min,
   gss_cred_id_t initiator_cred_handle,
   struct stub_gss_ctx_id_t_desc **context,
   gss_name_t target_name,
@@ -283,8 +283,8 @@ stub_gss_init_sec_context(OM_uint32 *min,
   return GSS_S_CONTINUE_NEEDED;
 }
 
-static OM_uint32
+static OM_uint32 stub_gss_delete_sec_context(
-stub_gss_delete_sec_context(OM_uint32 *min,
+  OM_uint32 *min,
   struct stub_gss_ctx_id_t_desc **context,
   gss_buffer_t output_token)
 {

lib/curl_ntlm_core.c

@@ -141,7 +141,7 @@ static void extend_key_56_to_64(const unsigned char *key_56, char *key)
   key[4] = (char)(((key_56[3] << 4) & 0xFF) | (key_56[4] >> 4));
   key[5] = (char)(((key_56[4] << 3) & 0xFF) | (key_56[5] >> 5));
   key[6] = (char)(((key_56[5] << 2) & 0xFF) | (key_56[6] >> 6));
-  key[7] = (char) ((key_56[6] << 1) & 0xFF);
+  key[7] = (char)((key_56[6] << 1) & 0xFF);
 }
 
 #ifdef USE_OPENSSL_DES

lib/curl_setup.h

@@ -370,11 +370,9 @@
   defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
   !defined(CURL_NO_FMT_CHECKS)
 #if defined(__MINGW32__) && !defined(__clang__)
-#define CURL_PRINTF(fmt, arg) \
+#define CURL_PRINTF(fmt, arg) __attribute__((format(gnu_printf, fmt, arg)))
-  __attribute__((format(gnu_printf, fmt, arg)))
 #else
-#define CURL_PRINTF(fmt, arg) \
+#define CURL_PRINTF(fmt, arg) __attribute__((format(__printf__, fmt, arg)))
-  __attribute__((format(__printf__, fmt, arg)))
 #endif
 #else
 #define CURL_PRINTF(fmt, arg)
@@ -733,8 +731,7 @@
 #endif
 
 #if defined(USE_GNUTLS) || defined(USE_OPENSSL) || defined(USE_MBEDTLS) || \
-  defined(USE_WOLFSSL) || defined(USE_SCHANNEL) || \
+  defined(USE_WOLFSSL) || defined(USE_SCHANNEL) || defined(USE_RUSTLS)
-  defined(USE_RUSTLS)
 #define USE_SSL    /* SSL support has been enabled */
 #endif
 
@@ -1015,7 +1012,7 @@ struct timeval {
  * 'bool' stuff compatible with HP-UX headers.
  */
 #if defined(__hpux) && !defined(HAVE_BOOL_T)
-   typedef int bool;
+typedef int bool;
 #  define false 0
 #  define true 1
 #  define HAVE_BOOL_T
@@ -1028,10 +1025,10 @@ struct timeval {
  * global namespace though, so use bool_false and bool_true.
  */
 #ifndef HAVE_BOOL_T
-  typedef enum {
+typedef enum {
   bool_false = 0,
   bool_true = 1
-  } bool;
+} bool;
 
 /*
  * Use a define to let 'true' and 'false' use those enums. There

lib/curl_sha512_256.c

@@ -203,7 +203,7 @@ static CURLcode Curl_sha512_256_update(void *ctx,
                                        size_t length)
 {
   do {
-    word32 ilen = (word32) CURLMIN(length, UINT_MAX);
+    word32 ilen = (word32)CURLMIN(length, UINT_MAX);
     if(wc_Sha512_256Update(ctx, data, ilen))
       return CURLE_SSL_CIPHER;
     length -= ilen;
@@ -291,10 +291,7 @@ static CURLcode Curl_sha512_256_finish(unsigned char *digest, void *context)
 /* ** This implementation of SHA-512/256 hash calculation was originally ** *
  * ** written by Evgeny Grin (Karlson2k) for GNU libmicrohttpd.          ** *
  * ** The author ported the code to libcurl. The ported code is provided ** *
- * ** under curl license.                                                ** *
+ * ** under curl license.                                                ** */
- * ** This is a minimal version with minimal optimizations. Performance  ** *
- * ** can be significantly improved. Big-endian store and load macros    ** *
- * ** are obvious targets for optimization.                              ** */
 
 #ifdef __GNUC__
 #  if defined(__has_attribute) && defined(__STDC_VERSION__)

lib/curl_threads.c

@@ -47,8 +47,8 @@ static void *curl_thread_create_thunk(void *arg)
   return 0;
 }
 
-curl_thread_t Curl_thread_create(CURL_THREAD_RETURN_T
+curl_thread_t Curl_thread_create(
-                                 (CURL_STDCALL *func) (void *), void *arg)
+  CURL_THREAD_RETURN_T(CURL_STDCALL *func)(void *), void *arg)
 {
   curl_thread_t t = curlx_malloc(sizeof(pthread_t));
   struct Curl_actual_call *ac = NULL;
@@ -97,8 +97,8 @@ int Curl_thread_join(curl_thread_t *hnd)
 
 #elif defined(_WIN32)
 
-curl_thread_t Curl_thread_create(CURL_THREAD_RETURN_T
+curl_thread_t Curl_thread_create(
-                                 (CURL_STDCALL *func) (void *), void *arg)
+  CURL_THREAD_RETURN_T(CURL_STDCALL *func)(void *), void *arg)
 {
   curl_thread_t t = CreateThread(NULL, 0, func, arg, 0, NULL);
   if(!t) {

lib/curl_threads.h

@@ -65,8 +65,8 @@ CURLcode Curl_cond_timedwait(curl_cond_t *c, curl_mutex_t *m,
 
 #ifdef USE_THREADS
 
-curl_thread_t Curl_thread_create(CURL_THREAD_RETURN_T
+curl_thread_t Curl_thread_create(
-                                 (CURL_STDCALL *func) (void *), void *arg);
+  CURL_THREAD_RETURN_T(CURL_STDCALL *func)(void *), void *arg);
 
 void Curl_thread_destroy(curl_thread_t *hnd);
 

lib/dict.c

@@ -64,7 +64,6 @@
 #define DICT_DEFINE2 "/D:"
 #define DICT_DEFINE3 "/LOOKUP:"
 
-
 #define DYN_DICT_WORD 10000
 static char *unescape_word(const char *input)
 {

lib/dnscache.c

@@ -329,8 +329,6 @@ static int num_addresses(const struct Curl_addrinfo *addr)
   return i;
 }
 
-UNITTEST CURLcode Curl_shuffle_addr(struct Curl_easy *data,
-                                    struct Curl_addrinfo **addr);
 /*
  * Curl_shuffle_addr() shuffles the order of addresses in a 'Curl_addrinfo'
  * struct by re-linking its linked list.
@@ -343,6 +341,8 @@ UNITTEST CURLcode Curl_shuffle_addr(struct Curl_easy *data,
  *
  * @unittest: 1608
  */
+UNITTEST CURLcode Curl_shuffle_addr(struct Curl_easy *data,
+                                    struct Curl_addrinfo **addr);
 UNITTEST CURLcode Curl_shuffle_addr(struct Curl_easy *data,
                                     struct Curl_addrinfo **addr)
 {
@@ -407,8 +407,8 @@ static bool dnscache_ai_has_family(struct Curl_addrinfo *ai,
   return FALSE;
 }
 
-static struct Curl_dns_entry *
+static struct Curl_dns_entry *dnscache_entry_create(
-dnscache_entry_create(struct Curl_easy *data,
+  struct Curl_easy *data,
   uint8_t dns_queries,
   struct Curl_addrinfo **paddr1,
   struct Curl_addrinfo **paddr2,
@@ -488,8 +488,7 @@ out:
   return dns;
 }
 
-struct Curl_dns_entry *
+struct Curl_dns_entry *Curl_dnscache_mk_entry(struct Curl_easy *data,
-Curl_dnscache_mk_entry(struct Curl_easy *data,
                                               uint8_t dns_queries,
                                               struct Curl_addrinfo **paddr,
                                               const char *hostname,
@@ -500,8 +499,7 @@ Curl_dnscache_mk_entry(struct Curl_easy *data,
                                port, FALSE);
 }
 
-struct Curl_dns_entry *
+struct Curl_dns_entry *Curl_dnscache_mk_entry2(struct Curl_easy *data,
-Curl_dnscache_mk_entry2(struct Curl_easy *data,
                                                uint8_t dns_queries,
                                                struct Curl_addrinfo **paddr1,
                                                struct Curl_addrinfo **paddr2,
@@ -530,8 +528,7 @@ void Curl_dns_entry_set_https_rr(struct Curl_dns_entry *dns,
 }
 #endif /* USE_HTTPSRR */
 
-static struct Curl_dns_entry *
+static struct Curl_dns_entry *dnscache_add_addr(struct Curl_easy *data,
-dnscache_add_addr(struct Curl_easy *data,
                                                 struct Curl_dnscache *dnscache,
                                                 uint8_t dns_queries,
                                                 struct Curl_addrinfo **paddr,

lib/dnscache.h

@@ -57,20 +57,18 @@ struct Curl_dns_entry {
  * Create a `Curl_dns_entry` with a reference count of 1.
  * Use `Curl_dns_entry_unlink()` to release your hold on it.
  *
- * The call takes ownership of `addr`, even in case of failure, and always
+ * The call takes ownership of `paddr`, even in case of failure, and always
  * clears `*paddr`. It makes a copy of `hostname`.
  *
  * Returns entry or NULL on OOM.
  */
-struct Curl_dns_entry *
+struct Curl_dns_entry *Curl_dnscache_mk_entry(struct Curl_easy *data,
-Curl_dnscache_mk_entry(struct Curl_easy *data,
                                               uint8_t dns_queries,
                                               struct Curl_addrinfo **paddr,
                                               const char *hostname,
                                               uint16_t port);
 
-struct Curl_dns_entry *
+struct Curl_dns_entry *Curl_dnscache_mk_entry2(struct Curl_easy *data,
-Curl_dnscache_mk_entry2(struct Curl_easy *data,
                                                uint8_t dns_queries,
                                                struct Curl_addrinfo **paddr1,
                                                struct Curl_addrinfo **paddr2,
@@ -92,7 +90,6 @@ struct Curl_dns_entry *Curl_dns_entry_link(struct Curl_easy *data,
 void Curl_dns_entry_unlink(struct Curl_easy *data,
                            struct Curl_dns_entry **pdns);
 
-
 struct Curl_dnscache {
   struct Curl_hash entries;
 };

lib/doh.c

@@ -714,7 +714,7 @@ static DOHcode doh_rdata(const unsigned char *doh,
   return DOH_OK;
 }
 
-UNITTEST void de_init(struct dohentry *d);
+UNITTEST void de_init(struct dohentry *de);
 UNITTEST void de_init(struct dohentry *de)
 {
   int i;
@@ -1117,11 +1117,10 @@ static CURLcode doh_decode_rdata_name(const unsigned char **buf,
   return CURLE_OK;
 }
 
+/* @unittest 1658 */
 UNITTEST CURLcode doh_resp_decode_httpsrr(struct Curl_easy *data,
                                           const unsigned char *cp, size_t len,
                                           struct Curl_https_rrinfo **hrr);
-
-/* @unittest 1658 */
 UNITTEST CURLcode doh_resp_decode_httpsrr(struct Curl_easy *data,
                                           const unsigned char *cp, size_t len,
                                           struct Curl_https_rrinfo **hrr)

lib/easygetopt.c

@@ -62,8 +62,8 @@ const struct curl_easyoption *curl_easy_option_by_id(CURLoption id)
 }
 
 /* Iterates over available options */
-const struct curl_easyoption *
+const struct curl_easyoption *curl_easy_option_next(
-curl_easy_option_next(const struct curl_easyoption *prev)
+  const struct curl_easyoption *prev)
 {
   if(prev && prev->name) {
     prev++;
@@ -88,8 +88,8 @@ const struct curl_easyoption *curl_easy_option_by_id(CURLoption id)
   return NULL;
 }
 
-const struct curl_easyoption *
+const struct curl_easyoption *curl_easy_option_next(
-curl_easy_option_next(const struct curl_easyoption *prev)
+  const struct curl_easyoption *prev)
 {
   (void)prev;
   return NULL;

lib/ftp.c

@@ -1686,17 +1686,17 @@ static CURLcode ftp_state_ul_setup(struct Curl_easy *data,
 
   if((data->state.resume_from && !sizechecked) ||
      ((data->state.resume_from > 0) && sizechecked)) {
-    /* we are about to continue the uploading of a file */
+    /* we are about to continue the uploading of a file
-    /* 1. get already existing file's size. We use the SIZE command for this
+       1. get already existing file's size. We use the SIZE command for this
           which may not exist in the server!  The SIZE command is not in
-       RFC959. */
+          RFC959.
 
-    /* 2. This used to set REST, but since we can do append, we issue no
+       2. This used to set REST, but since we can do append, we issue no
-       another ftp command. Skip the source file offset and APPEND the rest on
+          another ftp command. Skip the source file offset and APPEND the rest
-       the file instead */
+          on the file instead
 
-    /* 3. pass file-size number of bytes in the source file */
+       3. pass file-size number of bytes in the source file
-    /* 4. lower the infilesize counter */
+       4. lower the infilesize counter */
     /* => transfer as usual */
     int seekerr = CURL_SEEKFUNC_OK;
 
@@ -2507,7 +2507,6 @@ static bool twodigit(const char *p, int *val)
 /*
  * Unittest @1668
  */
-
 UNITTEST bool ftp_213_date(const char *p, int *year, int *month, int *day,
                            int *hour, int *minute, int *second);
 UNITTEST bool ftp_213_date(const char *p, int *year, int *month, int *day,
@@ -3888,8 +3887,8 @@ static CURLcode ftp_nb_type(struct Curl_easy *data,
  * This is the actual DO function for FTP. Get a file/directory according to
  * the options previously setup.
  */
-static
+static CURLcode ftp_perform(
-CURLcode ftp_perform(struct Curl_easy *data,
+  struct Curl_easy *data,
   struct ftp_conn *ftpc,
   struct FTP *ftp,
   bool *connected,  /* connect status after PASV / PORT */

lib/ftplistparser.c

@@ -325,8 +325,7 @@ static CURLcode ftp_pl_insert_finfo(struct Curl_easy *data,
 
   /* filter pattern-corresponding filenames */
   Curl_set_in_callback(data, TRUE);
-  if(compare(data->set.fnmatch_data, wc->pattern,
+  if(compare(data->set.fnmatch_data, wc->pattern, finfo->filename) == 0) {
-             finfo->filename) == 0) {
     /* discard symlink which is containing multiple " -> " */
     if((finfo->filetype == CURLFILETYPE_SYMLINK) && finfo->strings.target &&
        (strstr(finfo->strings.target, " -> "))) {

lib/hash.c

@@ -359,8 +359,8 @@ void Curl_hash_start_iterate(struct Curl_hash *hash,
 #endif
 }
 
-struct Curl_hash_element *
+struct Curl_hash_element *Curl_hash_next_element(
-Curl_hash_next_element(struct Curl_hash_iterator *iter)
+  struct Curl_hash_iterator *iter)
 {
   struct Curl_hash *h;
   DEBUGASSERT(iter->init == ITERINIT);

lib/hash.h

@@ -97,8 +97,8 @@ size_t curlx_str_key_compare(void *k1, size_t key1_len, void *k2,
                              size_t key2_len);
 void Curl_hash_start_iterate(struct Curl_hash *hash,
                              struct Curl_hash_iterator *iter);
-struct Curl_hash_element *
+struct Curl_hash_element *Curl_hash_next_element(
-Curl_hash_next_element(struct Curl_hash_iterator *iter);
+  struct Curl_hash_iterator *iter);
 
 void Curl_hash_print(struct Curl_hash *h, void (*func)(void *));
 

lib/hmac.c

@@ -155,7 +155,7 @@ CURLcode Curl_hmacit(const struct HMAC_params *hashparams,
 
   /* Update the digest with the given challenge */
   do {
-    unsigned int ilen = (unsigned int) CURLMIN(datalen, UINT_MAX);
+    unsigned int ilen = (unsigned int)CURLMIN(datalen, UINT_MAX);
     Curl_HMAC_update(ctxt, data, ilen);
     datalen -= ilen;
     data += ilen;

lib/hostip.c

@@ -111,14 +111,6 @@
  * CURLRES_* defines based on the config*.h and curl_setup.h defines.
  */
 
-/*
- * Curl_printable_address() stores a printable version of the 1st address
- * given in the 'ai' argument. The result will be stored in the buf that is
- * bufsize bytes big.
- *
- * If the conversion fails, the target buffer is empty.
- */
-
 uint8_t Curl_resolv_dns_queries(struct Curl_easy *data, uint8_t ip_version)
 {
   (void)data;
@@ -129,7 +121,7 @@ uint8_t Curl_resolv_dns_queries(struct Curl_easy *data, uint8_t ip_version)
     return CURL_DNSQ_A;
   default:
     if(Curl_ipv6works(data))
-      return (CURL_DNSQ_A|CURL_DNSQ_AAAA);
+      return (CURL_DNSQ_A | CURL_DNSQ_AAAA);
     else
       return CURL_DNSQ_A;
   }
@@ -139,15 +131,15 @@ uint8_t Curl_resolv_dns_queries(struct Curl_easy *data, uint8_t ip_version)
 const char *Curl_resolv_query_str(uint8_t dns_queries)
 {
   switch(dns_queries) {
-  case (CURL_DNSQ_A|CURL_DNSQ_AAAA|CURL_DNSQ_HTTPS):
+  case (CURL_DNSQ_A | CURL_DNSQ_AAAA | CURL_DNSQ_HTTPS):
     return "A+AAAA+HTTPS";
-  case (CURL_DNSQ_A|CURL_DNSQ_AAAA):
+  case (CURL_DNSQ_A | CURL_DNSQ_AAAA):
     return "A+AAAA";
-  case (CURL_DNSQ_AAAA|CURL_DNSQ_HTTPS):
+  case (CURL_DNSQ_AAAA | CURL_DNSQ_HTTPS):
     return "AAAA+HTTPS";
   case (CURL_DNSQ_AAAA):
     return "AAAA";
-  case (CURL_DNSQ_A|CURL_DNSQ_HTTPS):
+  case (CURL_DNSQ_A | CURL_DNSQ_HTTPS):
     return "A+HTTPS";
   case (CURL_DNSQ_A):
     return "A";
@@ -162,6 +154,13 @@ const char *Curl_resolv_query_str(uint8_t dns_queries)
 }
 #endif
 
+/*
+ * Curl_printable_address() stores a printable version of the 1st address
+ * given in the 'ai' argument. The result will be stored in the buf that is
+ * bufsize bytes big.
+ *
+ * If the conversion fails, the target buffer is empty.
+ */
 void Curl_printable_address(const struct Curl_addrinfo *ai, char *buf,
                             size_t bufsize)
 {
@@ -360,8 +359,7 @@ CURLcode Curl_resolv_announce_start(struct Curl_easy *data,
 }
 
 #ifdef USE_CURL_ASYNC
-static struct Curl_resolv_async *
+static struct Curl_resolv_async *hostip_async_new(struct Curl_easy *data,
-hostip_async_new(struct Curl_easy *data,
                                                   uint8_t dns_queries,
                                                   const char *hostname,
                                                   uint16_t port,
@@ -442,9 +440,10 @@ static CURLcode hostip_resolv_take_result(struct Curl_easy *data,
   return result;
 }
 
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_resolv_get_ai(struct Curl_easy *data,
-Curl_resolv_get_ai(struct Curl_easy *data, uint32_t resolv_id,
+                                               uint32_t resolv_id,
-                   int ai_family, unsigned int index)
+                                               int ai_family,
+                                               unsigned int index)
 {
 #ifdef CURLRES_ASYNCH
   struct Curl_resolv_async *async = Curl_async_get(data, resolv_id);
@@ -959,7 +958,6 @@ CURLcode Curl_resolv(struct Curl_easy *data,
                        timeout_ms, TRUE, presolv_id, entry);
 }
 
-
 #ifdef USE_CURL_ASYNC
 
 struct Curl_resolv_async *Curl_async_get(struct Curl_easy *data,

lib/hostip.h

@@ -51,8 +51,8 @@ struct Curl_dns_entry;
 #define CURL_DNSQ_AAAA        (1U << 1)
 #define CURL_DNSQ_HTTPS       (1U << 2)
 
-#define CURL_DNSQ_ALL         (CURL_DNSQ_A|CURL_DNSQ_AAAA|CURL_DNSQ_HTTPS)
+#define CURL_DNSQ_ALL         (CURL_DNSQ_A | CURL_DNSQ_AAAA | CURL_DNSQ_HTTPS)
-#define CURL_DNSQ_IP(x)       (uint8_t)((x)&(CURL_DNSQ_A|CURL_DNSQ_AAAA))
+#define CURL_DNSQ_IP(x)       (uint8_t)((x)&(CURL_DNSQ_A | CURL_DNSQ_AAAA))
 
 #ifdef CURLVERBOSE
 const char *Curl_resolv_query_str(uint8_t dns_queries);
@@ -88,10 +88,10 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, uint16_t port);
 
 /*
  * Curl_printable_address() returns a printable version of the 1st address
- * given in the 'ip' argument. The result will be stored in the buf that is
+ * given in the 'ai' argument. The result will be stored in the buf that is
  * bufsize bytes big.
  */
-void Curl_printable_address(const struct Curl_addrinfo *ip,
+void Curl_printable_address(const struct Curl_addrinfo *ai,
                             char *buf, size_t bufsize);
 
 /* Start DNS resolving for the given parameters. Returns
@@ -142,25 +142,26 @@ CURLcode Curl_resolv_take_result(struct Curl_easy *data, uint32_t resolv_id,
 
 void Curl_resolv_destroy(struct Curl_easy *data, uint32_t resolv_id);
 
-const struct Curl_addrinfo *
+const struct Curl_addrinfo *Curl_resolv_get_ai(struct Curl_easy *data,
-Curl_resolv_get_ai(struct Curl_easy *data, uint32_t resolv_id,
+                                               uint32_t resolv_id,
-                   int ai_family, unsigned int index);
+                                               int ai_family,
+                                               unsigned int index);
 #ifdef USE_HTTPSRR
-const struct Curl_https_rrinfo *
+const struct Curl_https_rrinfo *Curl_resolv_get_https(struct Curl_easy *data,
-Curl_resolv_get_https(struct Curl_easy *data, uint32_t resolv_id);
+                                                      uint32_t resolv_id);
 bool Curl_resolv_knows_https(struct Curl_easy *data, uint32_t resolv_id);
 #endif /* USE_HTTPSRR */
 
-#else /* USE_CURL_ASYNC */
+#else /* !USE_CURL_ASYNC */
 #define Curl_resolv_shutdown_all(x)      Curl_nop_stmt
 #define Curl_resolv_destroy_all(x)       Curl_nop_stmt
 #define Curl_resolv_take_result(x, y, z) CURLE_NOT_BUILT_IN
-#define Curl_resolv_get_ai(x,y,z, a)  NULL
+#define Curl_resolv_get_ai(x, y, z, a)   NULL
-#define Curl_resolv_get_https(x,y)    NULL
+#define Curl_resolv_get_https(x, y)      NULL
-#define Curl_resolv_knows_https(x,y)  TRUE
+#define Curl_resolv_knows_https(x, y)    TRUE
-#define Curl_resolv_pollset(x,y)      CURLE_OK
+#define Curl_resolv_pollset(x, y)        CURLE_OK
-#define Curl_resolv_destroy(x,y)      Curl_nop_stmt
+#define Curl_resolv_destroy(x, y)        Curl_nop_stmt
-#endif /* USE_CURL_ASYNC, else */
+#endif /* USE_CURL_ASYNC */
 
 CURLcode Curl_resolver_error(struct Curl_easy *data, const char *detail);
 

lib/http.c

@@ -472,52 +472,52 @@ static bool http_should_fail(struct Curl_easy *data, int httpcode)
   DEBUGASSERT(data->conn);
 
   /*
-  ** If we have not been asked to fail on error,
+   * If we have not been asked to fail on error,
-  ** do not fail.
+   * do not fail.
    */
   if(!data->set.http_fail_on_error)
     return FALSE;
 
   /*
-  ** Any code < 400 is never terminal.
+   * Any code < 400 is never terminal.
    */
   if(httpcode < 400)
     return FALSE;
 
   /*
-  ** A 416 response to a resume request is presumably because the file is
+   * A 416 response to a resume request is presumably because the file is
-  ** already completely downloaded and thus not actually a fail.
+   * already completely downloaded and thus not actually a fail.
    */
   if(data->state.resume_from && data->state.httpreq == HTTPREQ_GET &&
      httpcode == 416)
     return FALSE;
 
   /*
-  ** Any code >= 400 that is not 401 or 407 is always
+   * Any code >= 400 that is not 401 or 407 is always
-  ** a terminal error
+   * a terminal error
    */
   if((httpcode != 401) && (httpcode != 407))
     return TRUE;
 
   /*
-  ** All we have left to deal with is 401 and 407
+   * All we have left to deal with is 401 and 407
    */
   DEBUGASSERT((httpcode == 401) || (httpcode == 407));
 
   /*
-  ** Examine the current authentication state to see if this is an error. The
+   * Examine the current authentication state to see if this is an error. The
-  ** idea is for this function to get called after processing all the headers
+   * idea is for this function to get called after processing all the headers
-  ** in a response message. If we have been to asked to authenticate
+   * in a response message. If we have been to asked to authenticate
-  ** a particular stage, and we have done it, we are OK. If we are already
+   * a particular stage, and we have done it, we are OK. If we are already
-  ** completely authenticated, it is not OK to get another 401 or 407.
+   * completely authenticated, it is not OK to get another 401 or 407.
-  **
+   *
-  ** It is possible for authentication to go stale such that the client needs
+   * It is possible for authentication to go stale such that the client needs
-  ** to reauthenticate. Once that info is available, use it here.
+   * to reauthenticate. Once that info is available, use it here.
    */
 
   /*
-  ** Either we are not authenticating, or we are supposed to be authenticating
+   * Either we are not authenticating, or we are supposed to be authenticating
-  ** something else. This is an error.
+   * something else. This is an error.
    */
   if((httpcode == 401) && !data->state.aptr.user)
     return TRUE;
@@ -766,14 +766,14 @@ static CURLcode output_auth_headers(struct Curl_easy *data,
  *
  * @returns CURLcode
  */
-CURLcode
+CURLcode Curl_http_output_auth(struct Curl_easy *data,
-Curl_http_output_auth(struct Curl_easy *data,
                                struct connectdata *conn,
                                const char *request,
                                Curl_HttpReq httpreq,
                                const char *path,
-                      bool proxytunnel) /* TRUE if this is the request setting
+                               bool proxytunnel) /* TRUE if this is
-                                           up the proxy tunnel */
+                                                    the request setting up
+                                                    the proxy tunnel */
 {
   CURLcode result = CURLE_OK;
   struct auth *authhost;
@@ -4024,7 +4024,7 @@ static void http_check_auth_closure(struct Curl_easy *data,
 #endif
 }
 #else
-#define http_check_auth_closure(x,y) /* empty */
+#define http_check_auth_closure(x, y) /* empty */
 #endif
 
 /*
@@ -4603,7 +4603,7 @@ CURLcode Curl_http_write_resp_hd(struct Curl_easy *data,
 
   result = http_rw_hd(data, hd, hdlen, &tmp, 0, &consumed);
   if(!result && is_eos) {
-    result = Curl_client_write(data, (CLIENTWRITE_BODY|CLIENTWRITE_EOS),
+    result = Curl_client_write(data, (CLIENTWRITE_BODY | CLIENTWRITE_EOS),
                                &tmp, 0);
   }
   return result;

lib/http.h

@@ -185,14 +185,14 @@ CURLcode Curl_http_write_resp_hds(struct Curl_easy *data,
  *
  * @returns CURLcode
  */
-CURLcode
+CURLcode Curl_http_output_auth(struct Curl_easy *data,
-Curl_http_output_auth(struct Curl_easy *data,
                                struct connectdata *conn,
                                const char *request,
                                Curl_HttpReq httpreq,
                                const char *path,
-                      bool proxytunnel); /* TRUE if this is the request setting
+                               bool proxytunnel); /* TRUE if this is
-                                            up the proxy tunnel */
+                                                     the request setting up
+                                                     the proxy tunnel */
 
 /* Decode HTTP status code string. */
 CURLcode Curl_http_decode_status(int *pstatus, const char *s, size_t len);

lib/http_aws_sigv4.c

@@ -680,7 +680,8 @@ static int compare_func(const void *a, const void *b)
 }
 
 UNITTEST CURLcode canon_path(const char *q, size_t len,
-                             struct dynbuf *new_path, bool normalize);
+                             struct dynbuf *new_path,
+                             bool do_uri_encode);
 UNITTEST CURLcode canon_path(const char *q, size_t len,
                              struct dynbuf *new_path,
                              bool do_uri_encode)

lib/http_chunks.c

@@ -258,12 +258,12 @@ static CURLcode httpchunk_readwrite(struct Curl_easy *data,
             size_t trlen = curlx_dyn_len(&ch->trailer);
             if(cw_next)
               result = Curl_cwriter_write(data, cw_next,
-                                          CLIENTWRITE_HEADER|
+                                          CLIENTWRITE_HEADER |
                                           CLIENTWRITE_TRAILER,
                                           tr, trlen);
             else
               result = Curl_client_write(data,
-                                         CLIENTWRITE_HEADER|
+                                         CLIENTWRITE_HEADER |
                                          CLIENTWRITE_TRAILER,
                                          tr, trlen);
             if(result) {

lib/httpsrr.c

@@ -135,7 +135,7 @@ void Curl_httpsrr_trace(struct Curl_easy *data,
 }
 
 #else
-#define httpsrr_report_addr(a,b,c,d)    Curl_nop_stmt
+#define httpsrr_report_addr(a, b, c, d) Curl_nop_stmt
 #endif /* CURLVERBOSE */
 
 CURLcode Curl_httpsrr_set(struct Curl_https_rrinfo *hi,
@@ -194,8 +194,8 @@ CURLcode Curl_httpsrr_set(struct Curl_https_rrinfo *hi,
   return result;
 }
 
-struct Curl_https_rrinfo *
+struct Curl_https_rrinfo *Curl_httpsrr_dup_move(
-Curl_httpsrr_dup_move(struct Curl_https_rrinfo *rrinfo)
+  struct Curl_https_rrinfo *rrinfo)
 {
   struct Curl_https_rrinfo *dup = curlx_memdup(rrinfo, sizeof(*rrinfo));
   if(dup)

lib/httpsrr.h

@@ -62,8 +62,8 @@ struct Curl_https_rrinfo {
 CURLcode Curl_httpsrr_set(struct Curl_https_rrinfo *hi,
                           uint16_t rrkey, const uint8_t *val, size_t vlen);
 
-struct Curl_https_rrinfo *
+struct Curl_https_rrinfo *Curl_httpsrr_dup_move(
-Curl_httpsrr_dup_move(struct Curl_https_rrinfo *rrinfo);
+  struct Curl_https_rrinfo *rrinfo);
 
 void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo);
 
@@ -87,7 +87,7 @@ CURLcode Curl_httpsrr_from_ares(const ares_dns_record_t *dnsrec,
 void Curl_httpsrr_trace(struct Curl_easy *data,
                         struct Curl_https_rrinfo *hi);
 #else
-#define Curl_httpsrr_trace(a,b)     Curl_nop_stmt
+#define Curl_httpsrr_trace(a, b) Curl_nop_stmt
 #endif
 
 #endif /* USE_HTTPSRR */

lib/md4.c

@@ -33,7 +33,7 @@
 /* OpenSSL 3.0.0 marks the MD4 functions as deprecated */
 #define OPENSSL_NO_MD4
 #else
-/* Cover also OPENSSL_NO_MD4 configured in openssl */
+/* Cover also OPENSSL_NO_MD4 configured in OpenSSL */
 #include <openssl/opensslconf.h>
 #endif
 #endif /* USE_OPENSSL */

lib/md5.c

@@ -548,7 +548,7 @@ CURLcode Curl_md5it(unsigned char *output,
   result = my_md5_init(&ctx);
   if(!result) {
     do {
-      unsigned int ilen = (unsigned int) CURLMIN(len, UINT_MAX);
+      unsigned int ilen = (unsigned int)CURLMIN(len, UINT_MAX);
       my_md5_update(&ctx, input, ilen);
       input += ilen;
       len -= ilen;

lib/mime.c

@@ -1937,7 +1937,7 @@ static CURLcode cr_mime_read(struct Curl_easy *data,
   case 0:
     if((ctx->total_len >= 0) && (ctx->read_len < ctx->total_len)) {
       failf(data, "client mime read EOF fail, "
-            "only %"FMT_OFF_T"/%"FMT_OFF_T
+            "only %" FMT_OFF_T "/%" FMT_OFF_T
             " of needed bytes read", ctx->read_len, ctx->total_len);
       return CURLE_READ_ERROR;
     }
@@ -1992,7 +1992,7 @@ static CURLcode cr_mime_read(struct Curl_easy *data,
   }
 
   CURL_TRC_READ(data, "cr_mime_read(len=%zu, total=%" FMT_OFF_T
-                ", read=%"FMT_OFF_T") -> %d, %zu, %d",
+                ", read=%" FMT_OFF_T ") -> %d, %zu, %d",
                 blen, ctx->total_len, ctx->read_len, result, *pnread, *peos);
   return result;
 }

lib/multi.c

@@ -74,7 +74,6 @@
 
 #define CURL_MULTI_HANDLE 0x000bab1e
 
-
 #ifdef DEBUGBUILD
 /* On a debug build, we want to fail hard on multi handles that
  * are not NULL, but no longer have the MAGIC touch. This gives

lib/progress.c

@@ -361,7 +361,6 @@ void Curl_pgrs_deliver_inc(struct Curl_easy *data, size_t delta)
   data->progress.deliver += delta;
 }
 
-
 void Curl_pgrs_download_inc(struct Curl_easy *data, size_t delta)
 {
   if(delta) {

lib/protocol.c

@@ -322,8 +322,7 @@ const struct Curl_scheme Curl_scheme_smb = {
 
 const struct Curl_scheme Curl_scheme_smbs = {
   "smbs",                               /* scheme */
-#if defined(CURL_ENABLE_SMB) && defined(USE_CURL_NTLM_CORE) &&  \
+#if defined(CURL_ENABLE_SMB) && defined(USE_CURL_NTLM_CORE) && defined(USE_SSL)
-  defined(USE_SSL)
   &Curl_protocol_smb,
 #else
   ZERO_NULL,

lib/request.h

@@ -38,7 +38,8 @@ struct UserDefined;
 /* Low level request receive/send io_flags checks. */
 #define CURL_REQ_WANT_SEND(d)  ((d)->req.io_flags & REQ_IO_SEND)
 #define CURL_REQ_WANT_RECV(d)  ((d)->req.io_flags & REQ_IO_RECV)
-#define CURL_REQ_WANT_IO(d)    ((d)->req.io_flags & (REQ_IO_RECV|REQ_IO_SEND))
+#define CURL_REQ_WANT_IO(d)    \
+  ((d)->req.io_flags & (REQ_IO_RECV | REQ_IO_SEND))
 /* Low level request receive/send io_flags manipulations. */
 #define CURL_REQ_SET_SEND(d)   ((d)->req.io_flags |= REQ_IO_SEND)
 #define CURL_REQ_SET_RECV(d)   ((d)->req.io_flags |= REQ_IO_RECV)
@@ -47,7 +48,7 @@ struct UserDefined;
 #define CURL_REQ_CLEAR_RECV(d) \
   ((d)->req.io_flags &= (uint8_t)~REQ_IO_RECV)
 #define CURL_REQ_CLEAR_IO(d)  \
-  ((d)->req.io_flags &= (uint8_t)~(REQ_IO_RECV|REQ_IO_SEND))
+  ((d)->req.io_flags &= (uint8_t)~(REQ_IO_RECV | REQ_IO_SEND))
 
 enum expect100 {
   EXP100_SEND_DATA,           /* enough waiting, send the body now */

lib/rtsp.c

@@ -234,7 +234,7 @@ static CURLcode rtsp_setup_body(struct Curl_easy *data,
       /* As stated in the http comments, it is probably not wise to
        * actually set a custom Content-Length in the headers */
       if(!Curl_checkheaders(data, STRCONST("Content-Length"))) {
-        result = curlx_dyn_addf(reqp, "Content-Length: %" FMT_OFF_T"\r\n",
+        result = curlx_dyn_addf(reqp, "Content-Length: %" FMT_OFF_T "\r\n",
                                 req_clen);
         if(result)
           return result;

lib/select.c

@@ -274,7 +274,7 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
     if(ufds[i].fd == CURL_SOCKET_BAD)
       continue;
     VERIFY_SOCK(ufds[i].fd);
-    if(ufds[i].events & (POLLIN |POLLOUT |POLLPRI |
+    if(ufds[i].events & (POLLIN | POLLOUT | POLLPRI |
                          POLLRDNORM | POLLWRNORM | POLLRDBAND)) {
       if(ufds[i].fd > maxfd)
         maxfd = ufds[i].fd;
@@ -636,9 +636,9 @@ CURLcode Curl_pollset_set(struct Curl_easy *data,
                           bool do_in, bool do_out)
 {
   return Curl_pollset_change(data, ps, sock,
-                             (do_in ? CURL_POLL_IN : 0)|
+                             (do_in ? CURL_POLL_IN : 0) |
                              (do_out ? CURL_POLL_OUT : 0),
-                             (!do_in ? CURL_POLL_IN : 0)|
+                             (!do_in ? CURL_POLL_IN : 0) |
                              (!do_out ? CURL_POLL_OUT : 0));
 }
 

lib/select.h

@@ -35,9 +35,7 @@
  * Definition of pollfd struct and constants for platforms lacking them.
  */
 
-#if !defined(HAVE_SYS_POLL_H) && \
+#if !defined(HAVE_SYS_POLL_H) && !defined(HAVE_POLL_H) && !defined(POLLIN)
-    !defined(HAVE_POLL_H) && \
-    !defined(POLLIN)
 
 #define POLLIN      0x01
 #define POLLPRI     0x02

lib/sendf.c

@@ -372,8 +372,8 @@ static CURLcode do_init_writer_stack(struct Curl_easy *data)
    The bit pattern defines to what "streams" to write to. Body and/or header.
    The defines are in sendf.h of course.
  */
-CURLcode Curl_client_write(struct Curl_easy *data,
+CURLcode Curl_client_write(struct Curl_easy *data, int type, const char *buf,
-                           int type, const char *buf, size_t len)
+                           size_t len)
 {
   CURLcode result;
 
@@ -675,7 +675,7 @@ static CURLcode cr_in_read(struct Curl_easy *data,
   case 0:
     if((ctx->total_len >= 0) && (ctx->read_len < ctx->total_len)) {
       failf(data, "client read function EOF fail, "
-            "only %"FMT_OFF_T"/%"FMT_OFF_T " of needed bytes read",
+            "only %" FMT_OFF_T "/%" FMT_OFF_T " of needed bytes read",
             ctx->read_len, ctx->total_len);
       result = CURLE_READ_ERROR;
       break;
@@ -729,8 +729,8 @@ static CURLcode cr_in_read(struct Curl_easy *data,
     *peos = (bool)ctx->seen_eos;
     break;
   }
-  CURL_TRC_READ(data, "cr_in_read(len=%zu, total=%"FMT_OFF_T
+  CURL_TRC_READ(data, "cr_in_read(len=%zu, total=%" FMT_OFF_T
-                ", read=%"FMT_OFF_T") -> %d, nread=%zu, eos=%d",
+                ", read=%" FMT_OFF_T ") -> %d, nread=%zu, eos=%d",
                 blen, ctx->total_len, ctx->read_len, result,
                 *pnread, *peos);
   return result;
@@ -1138,7 +1138,7 @@ CURLcode Curl_creader_set_fread(struct Curl_easy *data, curl_off_t len)
   cl_reset_reader(data);
   result = do_init_reader_stack(data, r);
 out:
-  CURL_TRC_READ(data, "add fread reader, len=%"FMT_OFF_T " -> %d",
+  CURL_TRC_READ(data, "add fread reader, len=%" FMT_OFF_T " -> %d",
                 len, result);
   return result;
 }

lib/setup-os400.h

@@ -67,22 +67,22 @@ extern int Curl_getnameinfo_a(const struct sockaddr *sa,
 
 /* GSSAPI wrappers. */
 
-extern OM_uint32 Curl_gss_import_name_a(OM_uint32 * minor_status,
+extern OM_uint32 Curl_gss_import_name_a(OM_uint32 *minor_status,
                                         gss_buffer_t in_name,
                                         gss_OID in_name_type,
-                                        gss_name_t * out_name);
+                                        gss_name_t *out_name);
 #define gss_import_name         Curl_gss_import_name_a
 
-extern OM_uint32 Curl_gss_display_status_a(OM_uint32 * minor_status,
+extern OM_uint32 Curl_gss_display_status_a(OM_uint32 *minor_status,
                                            OM_uint32 status_value,
                                            int status_type, gss_OID mech_type,
-                                           gss_msg_ctx_t * message_context,
+                                           gss_msg_ctx_t *message_context,
                                            gss_buffer_t status_string);
 #define gss_display_status      Curl_gss_display_status_a
 
-extern OM_uint32 Curl_gss_init_sec_context_a(OM_uint32 * minor_status,
+extern OM_uint32 Curl_gss_init_sec_context_a(OM_uint32 *minor_status,
                                              gss_cred_id_t cred_handle,
-                                             gss_ctx_id_t * context_handle,
+                                             gss_ctx_id_t *context_handle,
                                              gss_name_t target_name,
                                              gss_OID mech_type,
                                              gss_flags_t req_flags,
@@ -90,10 +90,10 @@ extern OM_uint32 Curl_gss_init_sec_context_a(OM_uint32 * minor_status,
                                              gss_channel_bindings_t
                                              input_chan_bindings,
                                              gss_buffer_t input_token,
-                                             gss_OID * actual_mech_type,
+                                             gss_OID *actual_mech_type,
                                              gss_buffer_t output_token,
-                                             gss_flags_t * ret_flags,
+                                             gss_flags_t *ret_flags,
-                                             OM_uint32 * time_rec);
+                                             OM_uint32 *time_rec);
 #define gss_init_sec_context    Curl_gss_init_sec_context_a
 
 extern OM_uint32 Curl_gss_delete_sec_context_a(OM_uint32 *minor_status,

lib/sha256.c

@@ -255,7 +255,7 @@ static void my_sha256_final(unsigned char *digest, void *in)
     (a)[0] = (unsigned char)((((unsigned long)(val)) >> 24) & 0xff); \
     (a)[1] = (unsigned char)((((unsigned long)(val)) >> 16) & 0xff); \
     (a)[2] = (unsigned char)((((unsigned long)(val)) >>  8) & 0xff); \
-    (a)[3] = (unsigned char) (((unsigned long)(val)) & 0xff);        \
+    (a)[3] = (unsigned char)(((unsigned long)(val)) & 0xff);         \
   } while(0)
 
 #define WPA_PUT_BE64(a, val)                            \
@@ -486,7 +486,7 @@ CURLcode Curl_sha256it(unsigned char *output, const unsigned char *input,
   result = my_sha256_init(&ctx);
   if(!result) {
     do {
-      unsigned int ilen = (unsigned int) CURLMIN(len, UINT_MAX);
+      unsigned int ilen = (unsigned int)CURLMIN(len, UINT_MAX);
       my_sha256_update(&ctx, input, ilen);
       len -= ilen;
       input += ilen;

lib/socks_gssapi.c

@@ -228,7 +228,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
     if(gss_major_status != GSS_S_CONTINUE_NEEDED)
       break;
 
-    /* analyse response */
+    /* analyze response */
 
     /*   GSS-API response looks like
      * +----+------+-----+----------------+

lib/telnet.c

@@ -1266,8 +1266,8 @@ static CURLcode telnet_do(struct Curl_easy *data, bool *done)
 
 #ifdef USE_WINSOCK
   /* We want to wait for both stdin and the socket. Since
-  ** the select() function in Winsock only works on sockets
+   * the select() function in Winsock only works on sockets
-  ** we have to use the WaitForMultipleObjects() call.
+   * we have to use the WaitForMultipleObjects() call.
    */
 
   /* First, create a sockets event object */

lib/uint-spbset.c

@@ -30,9 +30,6 @@
 #define CURL_UINT32_SPBSET_MAGIC  0x70737362
 #endif
 
-/* Clear the bitset, making it empty. */
-UNITTEST void Curl_uint32_spbset_clear(struct uint32_spbset *bset);
-
 void Curl_uint32_spbset_init(struct uint32_spbset *bset)
 {
   memset(bset, 0, sizeof(*bset));
@@ -41,6 +38,19 @@ void Curl_uint32_spbset_init(struct uint32_spbset *bset)
 #endif
 }
 
+/* Clear the bitset, making it empty. */
+UNITTEST void Curl_uint32_spbset_clear(struct uint32_spbset *bset);
+UNITTEST void Curl_uint32_spbset_clear(struct uint32_spbset *bset)
+{
+  struct uint32_spbset_chunk *next, *chunk;
+
+  for(chunk = bset->head.next; chunk; chunk = next) {
+    next = chunk->next;
+    curlx_free(chunk);
+  }
+  memset(&bset->head, 0, sizeof(bset->head));
+}
+
 void Curl_uint32_spbset_destroy(struct uint32_spbset *bset)
 {
   DEBUGASSERT(bset->init == CURL_UINT32_SPBSET_MAGIC);
@@ -61,19 +71,8 @@ uint32_t Curl_uint32_spbset_count(struct uint32_spbset *bset)
   return n;
 }
 
-UNITTEST void Curl_uint32_spbset_clear(struct uint32_spbset *bset)
+static struct uint32_spbset_chunk *uint32_spbset_get_chunk(
-{
+  struct uint32_spbset *bset, uint32_t i, bool grow)
-  struct uint32_spbset_chunk *next, *chunk;
-
-  for(chunk = bset->head.next; chunk; chunk = next) {
-    next = chunk->next;
-    curlx_free(chunk);
-  }
-  memset(&bset->head, 0, sizeof(bset->head));
-}
-
-static struct uint32_spbset_chunk *
-uint32_spbset_get_chunk(struct uint32_spbset *bset, uint32_t i, bool grow)
 {
   struct uint32_spbset_chunk *chunk, **panchor = NULL;
   uint32_t i_offset = (i & ~CURL_UINT32_SPBSET_CH_MASK);

lib/uint-table.c

@@ -29,9 +29,6 @@
 #define CURL_UINT32_TBL_MAGIC  0x62757473
 #endif
 
-/* Clear the table, making it empty. */
-UNITTEST void Curl_uint32_tbl_clear(struct uint32_tbl *tbl);
-
 void Curl_uint32_tbl_init(struct uint32_tbl *tbl,
                           Curl_uint32_tbl_entry_dtor *entry_dtor)
 {
@@ -82,14 +79,8 @@ CURLcode Curl_uint32_tbl_resize(struct uint32_tbl *tbl, uint32_t nrows)
   return CURLE_OK;
 }
 
-void Curl_uint32_tbl_destroy(struct uint32_tbl *tbl)
+/* Clear the table, making it empty. */
-{
+UNITTEST void Curl_uint32_tbl_clear(struct uint32_tbl *tbl);
-  DEBUGASSERT(tbl->init == CURL_UINT32_TBL_MAGIC);
-  Curl_uint32_tbl_clear(tbl);
-  curlx_free(tbl->rows);
-  memset(tbl, 0, sizeof(*tbl));
-}
-
 UNITTEST void Curl_uint32_tbl_clear(struct uint32_tbl *tbl)
 {
   DEBUGASSERT(tbl->init == CURL_UINT32_TBL_MAGIC);
@@ -98,6 +89,14 @@ UNITTEST void Curl_uint32_tbl_clear(struct uint32_tbl *tbl)
   tbl->last_key_added = UINT32_MAX;
 }
 
+void Curl_uint32_tbl_destroy(struct uint32_tbl *tbl)
+{
+  DEBUGASSERT(tbl->init == CURL_UINT32_TBL_MAGIC);
+  Curl_uint32_tbl_clear(tbl);
+  curlx_free(tbl->rows);
+  memset(tbl, 0, sizeof(*tbl));
+}
+
 uint32_t Curl_uint32_tbl_capacity(struct uint32_tbl *tbl)
 {
   return tbl->nrows;

lib/url.c

@@ -386,7 +386,7 @@ void Curl_init_userdefined(struct Curl_easy *data)
 #endif
 
   set->new_file_perms = 0644;    /* Default permissions */
-  set->allowed_protocols = (curl_prot_t) CURLPROTO_64ALL;
+  set->allowed_protocols = (curl_prot_t)CURLPROTO_64ALL;
   set->redir_protocols = CURLPROTO_REDIR;
 
 #if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)

lib/url.h

@@ -85,7 +85,7 @@ CURLcode Curl_conn_upkeep(struct Curl_easy *data,
 
 /**
  * Always eval all arguments, return the first
- * result != (CURLE_OK|CURLE_AGAIN) or `r1`.
+ * result != (CURLE_OK | CURLE_AGAIN) or `r1`.
  */
 CURLcode Curl_1st_fatal(CURLcode r1, CURLcode r2);
 

lib/version.c

@@ -243,11 +243,9 @@ char *curl_version(void)
 #endif
 #ifdef HAVE_GSSAPI
 #ifdef HAVE_GSSGNU
-  curl_msnprintf(gss_buf, sizeof(gss_buf), "libgss/%s",
+  curl_msnprintf(gss_buf, sizeof(gss_buf), "libgss/%s", GSS_VERSION);
-                 GSS_VERSION);
 #elif defined(CURL_KRB5_VERSION)
-  curl_msnprintf(gss_buf, sizeof(gss_buf), "mit-krb5/%s",
+  curl_msnprintf(gss_buf, sizeof(gss_buf), "mit-krb5/%s", CURL_KRB5_VERSION);
-                 CURL_KRB5_VERSION);
 #else
   curl_msnprintf(gss_buf, sizeof(gss_buf), "mit-krb5");
 #endif

lib/vssh/libssh.c

@@ -147,7 +147,7 @@ static int myssh_is_known(struct Curl_easy *data, struct ssh_conn *sshc)
     rc = ssh_get_publickey_hash(pubkey, SSH_PUBLICKEY_HASH_MD5, &hash, &hlen);
     if(rc != SSH_OK || hlen != 16) {
       failf(data,
-            "Denied establishing ssh session: md5 fingerprint not available");
+            "Denied establishing ssh session: MD5 fingerprint not available");
       goto cleanup;
     }
 
@@ -158,7 +158,7 @@ static int myssh_is_known(struct Curl_easy *data, struct ssh_conn *sshc)
 
     if(!curl_strequal(md5buffer, pubkey_md5)) {
       failf(data,
-            "Denied establishing ssh session: mismatch md5 fingerprint. "
+            "Denied establishing ssh session: mismatch MD5 fingerprint. "
             "Remote %s is not equal to %s", md5buffer, pubkey_md5);
       rc = SSH_ERROR;
       goto cleanup;

lib/vssh/libssh2.c

@@ -476,7 +476,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data,
                                        LIBSSH2_HOSTKEY_HASH_SHA256);
     if(!fingerprint) {
       failf(data,
-            "Denied establishing ssh session: sha256 fingerprint "
+            "Denied establishing ssh session: SHA256 fingerprint "
             "not available");
       myssh_to(data, sshc, SSH_SESSION_FREE);
       return CURLE_PEER_FAILED_VERIFICATION;
@@ -491,7 +491,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data,
     }
 
     if(!fingerprint_b64) {
-      failf(data, "sha256 fingerprint could not be encoded");
+      failf(data, "SHA256 fingerprint could not be encoded");
       myssh_to(data, sshc, SSH_SESSION_FREE);
       return CURLE_PEER_FAILED_VERIFICATION;
     }
@@ -509,13 +509,13 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data,
       b64_pos++;
     }
 
-    /* Before we authenticate we check the hostkey's sha256 fingerprint
+    /* Before we authenticate we check the hostkey's SHA256 fingerprint
      * against a known fingerprint, if available.
      */
     if((pub_pos != b64_pos) ||
        strncmp(fingerprint_b64, pubkey_sha256, pub_pos)) {
       failf(data,
-            "Denied establishing ssh session: mismatch sha256 fingerprint. "
+            "Denied establishing ssh session: mismatch SHA256 fingerprint. "
             "Remote %s is not equal to %s", fingerprint_b64, pubkey_sha256);
       curlx_free(fingerprint_b64);
       myssh_to(data, sshc, SSH_SESSION_FREE);
@@ -550,12 +550,12 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data,
     if(!fingerprint || !curl_strequal(md5buffer, pubkey_md5)) {
       if(fingerprint) {
         failf(data,
-              "Denied establishing ssh session: mismatch md5 fingerprint. "
+              "Denied establishing ssh session: mismatch MD5 fingerprint. "
               "Remote %s is not equal to %s", md5buffer, pubkey_md5);
       }
       else {
         failf(data,
-              "Denied establishing ssh session: md5 fingerprint "
+              "Denied establishing ssh session: MD5 fingerprint "
               "not available");
       }
       myssh_to(data, sshc, SSH_SESSION_FREE);

lib/vtls/keylog.c

@@ -35,10 +35,8 @@ static FILE *keylog_file_fp;
 
 void Curl_tls_keylog_open(void)
 {
-  char *keylog_file_name;
-
   if(!keylog_file_fp) {
-    keylog_file_name = curl_getenv("SSLKEYLOGFILE");
+    char *keylog_file_name = curl_getenv("SSLKEYLOGFILE");
     if(keylog_file_name) {
       keylog_file_fp = curlx_fopen(keylog_file_name, FOPEN_APPENDTEXT);
       if(keylog_file_fp) {

lib/vtls/openssl.c

@@ -2946,7 +2946,7 @@ static CURLcode ossl_windows_load_anchors(struct Curl_cfilter *cf,
   /* Import certificates from the Windows root certificate store if
      requested.
      https://stackoverflow.com/questions/9507184/
-     https://github.com/d3x0r/SACK/blob/master/src/netlib/ssl_layer.c#L1037
+     https://github.com/d3x0r/SACK/blob/ff15424d3c581b86d40f818532e5a400c516d39d/src/netlib/ssl_layer.c#L1410
      https://datatracker.ietf.org/doc/html/rfc5280 */
   const char *win_stores[] = {
     "ROOT",   /* Trusted Root Certification Authorities */

lib/vtls/schannel.c

@@ -175,20 +175,20 @@ static CURLcode schannel_set_ssl_version_min_max(DWORD *enabled_protocols,
   for(; i <= (ssl_version_max >> 16); ++i) {
     switch(i) {
     case CURL_SSLVERSION_TLSv1_0:
-      (*enabled_protocols) |= SP_PROT_TLS1_0_CLIENT;
+      *enabled_protocols |= SP_PROT_TLS1_0_CLIENT;
       break;
     case CURL_SSLVERSION_TLSv1_1:
-      (*enabled_protocols) |= SP_PROT_TLS1_1_CLIENT;
+      *enabled_protocols |= SP_PROT_TLS1_1_CLIENT;
       break;
     case CURL_SSLVERSION_TLSv1_2:
-      (*enabled_protocols) |= SP_PROT_TLS1_2_CLIENT;
+      *enabled_protocols |= SP_PROT_TLS1_2_CLIENT;
       break;
     case CURL_SSLVERSION_TLSv1_3:
 
       /* Windows Server 2022 and newer */
       if(curlx_verify_windows_version(10, 0, 20348, PLATFORM_WINNT,
                                       VERSION_GREATER_THAN_EQUAL)) {
-        (*enabled_protocols) |= SP_PROT_TLS1_3_CLIENT;
+        *enabled_protocols |= SP_PROT_TLS1_3_CLIENT;
         break;
       }
       else { /* Windows 10 and older */
@@ -277,7 +277,7 @@ static int get_alg_id_by_name(const char *name)
   return 0; /* not found */
 }
 
-#define NUM_CIPHERS 47 /* There are 47 options listed above */
+#define NUM_CIPHERS 47 /* There are a maximum of 47 options listed above */
 
 static CURLcode set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers,
                                 ALG_ID *algIds)

lib/vtls/vtls.c

@@ -1684,7 +1684,7 @@ struct Curl_cftype Curl_cft_ssl = {
 
 struct Curl_cftype Curl_cft_ssl_proxy = {
   "SSL-PROXY",
-  CF_TYPE_SSL|CF_TYPE_PROXY,
+  CF_TYPE_SSL | CF_TYPE_PROXY,
   CURL_LOG_LVL_NONE,
   ssl_cf_destroy,
   ssl_cf_connect,

lib/vtls/x509asn1.c

@@ -403,7 +403,8 @@ static CURLcode utf8asn1str(struct dynbuf *to, int type, const char *from,
  *
  * @unittest 1666
  */
-UNITTEST CURLcode encodeOID(struct dynbuf *buf, const char *b, const char *e);
+UNITTEST CURLcode encodeOID(struct dynbuf *store,
+                            const char *beg, const char *end);
 UNITTEST CURLcode encodeOID(struct dynbuf *store,
                             const char *beg, const char *end)
 {

m4/curl-functions.m4

@@ -418,7 +418,7 @@ struct SocketIFace *ISocket = NULL;
 #  else
 struct Library *SocketBase = NULL;
 #  endif
-#  define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
+#  define select(a, b, c, d, e)  WaitSelect(a, b, c, d, e, 0)
 #endif
 /* includes end */"
   AC_CHECK_HEADERS(

scripts/badwords

@@ -219,9 +219,8 @@ if(@exact) {
 }
 
 # Build a single combined regex for removing whitelisted content
-my $re_wl;
 my $pat = join('|', map { $_ } @whitelist);
-$re_wl = qr/($pat)/;
+my $re_wl = qr/($pat)/;
 
 my $errors = 0;
 

scripts/delta

@@ -120,7 +120,7 @@ my $numchanges = 0;
 my $numbugfixes = 0;
 my $numcontributors = 0;
 open(F, "<RELEASE-NOTES");
-my $mode=0;
+my $mode = 0;
 while(<F>) {
     if($_ =~ /following changes:/) {
         $mode=1;
@@ -175,7 +175,7 @@ printf "Added files:                    %d (total %d)\n",
 printf "Deleted files:                  %d (delta: %d)\n", $deletes,
     $creates - $deletes;
 print "Diffstat:$diffstat" if(!$fileschanged);
-printf "Files changed:                  %d (%.2f%%)\n", $fileschanged, $fileschanged*100/$afiles;
+printf "Files changed:                  %d (%.2f%%)\n", $fileschanged, $fileschanged * 100 / $afiles;
 printf "Lines inserted:                 %d\n", $insertions;
 printf "Lines deleted:                  %d (delta: %d)\n", $deletions,
     $insertions - $deletions;

src/tool_cfgable.c

@@ -21,9 +21,10 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include <stddef.h>
 #include "tool_setup.h"
 
+#include <stddef.h>
+
 #include "tool_cfgable.h"
 #include "tool_formparse.h"
 #include "tool_libinfo.h"

src/tool_findfile.c

@@ -62,7 +62,7 @@ static const struct finder conf_list[] = {
 
 static char *checkhome(const char *home, const char *fname, bool dotscore)
 {
-  const char pref[2] = { '.', '_' };
+  static const char pref[2] = { '.', '_' };
   int i;
   for(i = 0; i < (dotscore ? 2 : 1); i++) {
     char *c;

src/tool_getparam.c

@@ -124,7 +124,7 @@ static const struct LongShort aliases[]= {
   {"dns-servers",                ARG_STRG, ' ', C_DNS_SERVERS},
   {"doh-cert-status",            ARG_BOOL|ARG_TLS, ' ', C_DOH_CERT_STATUS},
   {"doh-insecure",               ARG_BOOL|ARG_TLS, ' ', C_DOH_INSECURE},
-  {"doh-url"        ,            ARG_STRG, ' ', C_DOH_URL},
+  {"doh-url",                    ARG_STRG, ' ', C_DOH_URL},
   {"dump-ca-embed",              ARG_NONE|ARG_TLS, ' ', C_DUMP_CA_EMBED},
   {"dump-header",                ARG_FILE, 'D', C_DUMP_HEADER},
   {"ech",                        ARG_STRG|ARG_TLS, ' ', C_ECH},
@@ -246,7 +246,8 @@ static const struct LongShort aliases[]= {
   {"proxy-ca-native",            ARG_BOOL|ARG_TLS, ' ', C_PROXY_CA_NATIVE},
   {"proxy-cacert",               ARG_FILE|ARG_TLS, ' ', C_PROXY_CACERT},
   {"proxy-capath",               ARG_FILE|ARG_TLS, ' ', C_PROXY_CAPATH},
-  {"proxy-cert",                ARG_FILE|ARG_TLS|ARG_CLEAR, ' ', C_PROXY_CERT},
+  {"proxy-cert",                 ARG_FILE|ARG_TLS|ARG_CLEAR, ' ',
+   C_PROXY_CERT},
   {"proxy-cert-type",            ARG_STRG|ARG_TLS, ' ', C_PROXY_CERT_TYPE},
   {"proxy-ciphers",              ARG_STRG|ARG_TLS, ' ', C_PROXY_CIPHERS},
   {"proxy-crlfile",              ARG_FILE|ARG_TLS, ' ', C_PROXY_CRLFILE},

src/tool_libinfo.c

@@ -132,7 +132,6 @@ size_t feature_count;
  * the latter is not returned by curl_version_info(), it is built from
  * the returned features bit mask.
  */
-
 CURLcode get_libcurl_info(void)
 {
   CURLcode result = CURLE_OK;
@@ -197,7 +196,6 @@ CURLcode get_libcurl_info(void)
  * a given protocol and thus allows comparing pointers rather than strings.
  * In addition, the returned pointer is not deallocated until the program ends.
  */
-
 const char *proto_token(const char *proto)
 {
   const char * const *builtin;

src/tool_operate.c

@@ -576,8 +576,8 @@ static CURLcode retrycheck(struct OperationConfig *config,
         /* We have written data to an output file, we truncate file */
         fflush(outs->stream);
         notef("Throwing away %" CURL_FORMAT_CURL_OFF_T " bytes", outs->bytes);
-        /* truncate file at the position where we started appending */
 
+        /* truncate file at the position where we started appending */
         if(toolx_ftruncate(fileno(outs->stream), outs->init)) {
           /* when truncate fails, we cannot append as then we
              create something strange, bail out */

src/tool_util.c

@@ -96,7 +96,7 @@ int toolx_ftruncate_win32(int fd, curl_off_t where)
 }
 #elif defined(__DJGPP__)
 /*
- * Only supports 'off_t' (signed 32 bit) as file size.
+ * Only supports 'off_t' (signed 32-bit) as file size.
  */
 int toolx_ftruncate_djgpp(int fd, curl_off_t where)
 {

tests/libtest/cli_h2_upgrade_extreme.c

@@ -137,7 +137,7 @@ static CURLcode test_cli_h2_upgrade_extreme(const char *URL)
         }
         curl_multi_remove_handle(multi, msg->easy_handle);
         curl_easy_cleanup(msg->easy_handle);
-        curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T" retiring "
+        curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T " retiring "
                       "(%d now running)\n", xfer_id, running_handles);
       }
     }

tests/libtest/cli_tls_session_reuse.c

@@ -221,7 +221,7 @@ static CURLcode test_cli_tls_session_reuse(const char *URL)
         curl_multi_remove_handle(multi, msg->easy_handle);
         curl_easy_cleanup(msg->easy_handle);
         --ongoing;
-        curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T" retiring "
+        curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T " retiring "
                       "(%d now running)\n", xfer_id, running_handles);
       }
     }

tests/libtest/lib1560.c

@@ -240,7 +240,7 @@ static const struct testcase get_parts_list[] = {
    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},
+   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},
@@ -261,7 +261,7 @@ static const struct testcase get_parts_list[] = {
    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},
+   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] | / "
@@ -387,7 +387,7 @@ static const struct testcase get_parts_list[] = {
    CURLU_DEFAULT_SCHEME, 0, CURLUE_MALFORMED_INPUT},
   /* no space allowed in scheme */
   {"htt ps://user:password@example.net/get?this=and-what", "",
-   CURLU_NON_SUPPORT_SCHEME|CURLU_ALLOW_SPACE, 0, CURLUE_BAD_SCHEME},
+   CURLU_NON_SUPPORT_SCHEME | CURLU_ALLOW_SPACE, 0, CURLUE_BAD_SCHEME},
   {"https://user:password@example.net/get?this=and what",
    "https | user | password | [13] | example.net | [15] | /get | "
    "this=and what | [17]",
@@ -472,7 +472,7 @@ static const struct testcase get_parts_list[] = {
    CURLU_DEFAULT_SCHEME, 0, CURLUE_NO_HOST},
   {"boing:80",
    "https | [11] | [12] | [13] | boing | 80 | / | [16] | [17]",
-   CURLU_DEFAULT_SCHEME|CURLU_GUESS_SCHEME, 0, CURLUE_OK},
+   CURLU_DEFAULT_SCHEME | CURLU_GUESS_SCHEME, 0, CURLUE_OK},
   {"http://[fd00:a41::50]:8080",
    "http | [11] | [12] | [13] | [fd00:a41::50] | 8080 | / | [16] | [17]",
    CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
@@ -1433,11 +1433,11 @@ static const struct redircase set_url_list[] = {
   {"http://example.com/please/../gimme/%TESTNUMBER?foobar#hello",
    "http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no",
    "http://example.net/there/tes%20t%20case=/%TESTNUMBER0002?+yes+no",
-   0, CURLU_URLENCODE|CURLU_ALLOW_SPACE, CURLUE_OK},
+   0, CURLU_URLENCODE | CURLU_ALLOW_SPACE, CURLUE_OK},
   {"http://local.test?redirect=http://local.test:80?-321",
    "http://local.test:80?-123",
    "http://local.test:80/?-123",
-   0, CURLU_URLENCODE|CURLU_ALLOW_SPACE, CURLUE_OK},
+   0, CURLU_URLENCODE | CURLU_ALLOW_SPACE, CURLUE_OK},
   {"http://local.test?redirect=http://local.test:80?-321",
    "http://local.test:80?-123",
    "http://local.test:80/?-123",

tests/libtest/lib1965.c

@@ -27,7 +27,7 @@ static CURLcode test_lib1965(const char *URL)
 {
   CURLcode result = CURLE_OK;
   CURLUcode rc;
-  const char *schemes[] = {
+  static const char *schemes[] = {
     "bad!", "bad{", "bad/", "bad\\", "a!",
     "a+123", "http-2", "http.1",
     "a+-.123", "http-+++2", "http.1--",
@@ -35,9 +35,9 @@ static CURLcode test_lib1965(const char *URL)
     "ABC2", "2CBA", "", "a",
     "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd",
     "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddde",
-    NULL};
+    NULL };
   int i;
-  (void) URL;
+  (void)URL;
 
   global_init(CURL_GLOBAL_ALL);
 

tests/libtest/lib3102.c

@@ -34,7 +34,7 @@ static bool is_chain_in_order(struct curl_certinfo *cert_info)
 
   /* Chains with only a single certificate are always in order */
   if(cert_info->num_of_certs <= 1)
-    return 1;
+    return true;
 
   /* Enumerate each certificate in the chain */
   for(cert = 0; cert < cert_info->num_of_certs; cert++) {

tests/libtest/lib517.c

@@ -163,26 +163,26 @@ static CURLcode test_lib517(const char *URL)
 #if SIZEOF_TIME_T > 4
     { "2094 Nov 6 08:49:37", 3939871777 },
 #endif
-    { "01 Jan 2001 8:0:0", 978336000},
+    { "01 Jan 2001 8:0:0", 978336000 },
-    { "01 Jan 2001 8:00:0", 978336000},
+    { "01 Jan 2001 8:00:0", 978336000 },
     /* Out-of-range day-of-month Cases */
-    { "29 Feb 2023 12:00:00 GMT", 1677672000},
+    { "29 Feb 2023 12:00:00 GMT", 1677672000 },
-    { "31 Apr 2024 12:00:00 GMT", 1714564800},
+    { "31 Apr 2024 12:00:00 GMT", 1714564800 },
-    { "30 Feb 2024 12:00:00 GMT", 1709294400},
+    { "30 Feb 2024 12:00:00 GMT", 1709294400 },
-    { "01-13-2024", -1},
+    { "01-13-2024", -1 },
-    { "32 Jan 2024", -1},
+    { "32 Jan 2024", -1 },
-    { "31 Jan 2024", 1706659200},
+    { "31 Jan 2024", 1706659200 },
-    { "32 Feb 2024", -1},
+    { "32 Feb 2024", -1 },
-    { "32 Mar 2024", -1},
+    { "32 Mar 2024", -1 },
-    { "32 Apr 2024", -1},
+    { "32 Apr 2024", -1 },
-    { "32 May 2024", -1},
+    { "32 May 2024", -1 },
-    { "32 Jun 2024", -1},
+    { "32 Jun 2024", -1 },
-    { "32 Jul 2024", -1},
+    { "32 Jul 2024", -1 },
-    { "32 Aug 2024", -1},
+    { "32 Aug 2024", -1 },
-    { "32 Sep 2024", -1},
+    { "32 Sep 2024", -1 },
-    { "32 Oct 2024", -1},
+    { "32 Oct 2024", -1 },
-    { "32 Nov 2024", -1},
+    { "32 Nov 2024", -1 },
-    { "32 Dec 2024", -1},
+    { "32 Dec 2024", -1 },
     /* Timezone Offsets */
     { "Sun, 06 Nov 1994 08:49:37 +0530", 784091977 },
     { "Sun, 06 Nov 1994 08:49:37 +0545", 784091077 },
@@ -221,18 +221,18 @@ static CURLcode test_lib517(const char *URL)
     /* Y2K38 & Historical Boundaries */
 #if SIZEOF_TIME_T > 4
     /* for 32 bit time_t, we bail on >year 2037 */
-    { "19 Jan 2038 03:14:07 GMT", 2147483647},
+    { "19 Jan 2038 03:14:07 GMT", 2147483647 },
-    { "19 Jan 2038 03:14:08 GMT", 2147483648},
+    { "19 Jan 2038 03:14:08 GMT", 2147483648 },
-    { "01 Jan 69 00:00:00 GMT", 3124224000},
+    { "01 Jan 69 00:00:00 GMT", 3124224000 },
 #endif
-    { "01 Jan 1500 00:00:00 GMT", -1},
+    { "01 Jan 1500 00:00:00 GMT", -1 },
     /* Formatting & Malformed Junk */
-    { "Sun, 06-Nov/1994 08:49:37", 784111777},
+    { "Sun, 06-Nov/1994 08:49:37", 784111777 },
-    { "Sun,    06 Nov   1994   08:49:37 GMT", 784111777},
+    { "Sun,    06 Nov   1994   08:49:37 GMT", 784111777 },
-    { "  Sun, 06 Nov 1994 08:49:37 GMT  ", 784111777},
+    { "  Sun, 06 Nov 1994 08:49:37 GMT  ", 784111777 },
-    { "Date: Sun, 06 Nov 1994 08:49:37 GMT", -1},
+    { "Date: Sun, 06 Nov 1994 08:49:37 GMT", -1 },
     /* wrong day name is ignored */
-    { "Monday, 06 Nov 1994 08:49:37 GMT", 784111777},
+    { "Monday, 06 Nov 1994 08:49:37 GMT", 784111777 },
     { NULL, 0 }
   };
 

tests/libtest/mk-lib1521.pl

@@ -375,7 +375,7 @@ static CURLcode test_lib1521(const char *URL)
   curl_socket_t sockfd;
   const struct curl_certinfo *certinfo;
   struct curl_tlssessioninfo *tlssession;
-  struct curl_blob blob = { CURL_UNCONST("silly"), 5, 0};
+  struct curl_blob blob = { CURL_UNCONST("silly"), 5, 0 };
   CURLcode result = CURLE_OK;
   (void)URL;
   global_init(CURL_GLOBAL_ALL);
@@ -455,7 +455,7 @@ while(<STDIN>) {
                    "${w3}  curl_easy_setopt(curl, $name,";
         my $ignoreset = "${w3}/* set string again to check for leaks */\n".
             "${w3}(void)curl_easy_setopt(curl, $name,";
-        my $i = ' ' x (length($w) + 25);
+        my $i = ' ' x (length($w) + 21);
         my $fcheck = <<MOO
     if(first && present(first)) /* first setopt check only */
       err("$name", first, __LINE__);
@@ -515,7 +515,7 @@ MOO
         elsif($type eq "CURLOPTTYPE_OFF_T") {
             print $fh "${fpref} OFF_NO);\n$flongcheckzero";
             print $fh "$ifpresent";
-            my $lvl = " " x 29;
+            my $lvl = " " x 25;
             print $fh "${pref}\n${lvl}(curl_off_t)22);\n$longcheck";
             print $fh "${pref} OFF_HI);\n$longcheck";
             print $fh "${pref} OFF_LO);\n$longcheck";

tests/libtest/test1013.pl

@@ -36,7 +36,7 @@ my $what=$ARGV[2];
 
 # Read the output of curl --version
 my $curl_protocols="";
-open(CURL, "$ARGV[1]") || die "Cannot get curl $what list\n";
+open(CURL, $ARGV[1]) || die "Cannot get curl $what list\n";
 while(<CURL>) {
     $curl_protocols = $_ if(/$what:/i);
 }

tests/libtest/test1022.pl

@@ -34,7 +34,7 @@ if($#ARGV != 2) {
 my $what=$ARGV[2];
 
 # Read the output of curl --version
-open(CURL, "$ARGV[1]") || die "Cannot open curl --version list in $ARGV[1]\n";
+open(CURL, $ARGV[1]) || die "Cannot open curl --version list in $ARGV[1]\n";
 $_ = <CURL>;
 chomp;
 /libcurl\/([\.\d]+((-DEV)|(-rc\d)|(-\d+))?)/;

tests/pathhelp.pm

@@ -173,8 +173,8 @@ sub exe_ext {
     if($ENV{'CURL_TEST_EXE_EXT'}) {
         return $ENV{'CURL_TEST_EXE_EXT'};
     }
-    if($ENV{'CURL_TEST_EXE_EXT_'.$component}) {
+    if($ENV{'CURL_TEST_EXE_EXT_' . $component}) {
-        return $ENV{'CURL_TEST_EXE_EXT_'.$component};
+        return $ENV{'CURL_TEST_EXE_EXT_' . $component};
     }
     if($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys' ||
        $^O eq 'dos' || $^O eq 'os2') {

tests/runner.pm

@@ -114,9 +114,9 @@ use memanalyzer;
 #######################################################################
 # Global variables set elsewhere but used only by this package
 # These may only be set *before* runner_init is called
-our $DBGCURL=$CURL; #"../src/.libs/curl";  # alternative for debugging
+our $DBGCURL = $CURL; #"../src/.libs/curl";  # alternative for debugging
-our $valgrind_logfile="--log-file";  # the option name for valgrind >=3
+our $valgrind_logfile = "--log-file";  # the option name for valgrind >=3
-our $valgrind_tool="--tool=memcheck";
+our $valgrind_tool = "--tool=memcheck";
 our $gdb = checktestcmd("gdb");
 our $gdbthis = 0;  # run test case with debugger (gdb or lldb)
 our $gdbxwin;      # use windowed gdb when using gdb
@@ -142,12 +142,12 @@ my %controllerw;    # pipe that controller writes to
 
 # redirected stdout/stderr to these files
 sub stdoutfilename {
-    my ($logdir, $testnum)=@_;
+    my ($logdir, $testnum) = @_;
     return "$logdir/stdout$testnum";
 }
 
 sub stderrfilename {
-    my ($logdir, $testnum)=@_;
+    my ($logdir, $testnum) = @_;
     return "$logdir/stderr$testnum";
 }
 
@@ -157,19 +157,19 @@ sub stderrfilename {
 # runnerac_* functions
 # Called by controller
 sub runner_init {
-    my ($logdir, $jobs)=@_;
+    my ($logdir, $jobs) = @_;
 
     $multiprocess = !!$jobs;
 
     # enable memory debugging if curl is compiled with it
     $ENV{'CURL_MEMDEBUG'} = "$logdir/$MEMDUMP";
     delete $ENV{'CURL_ENTROPY'} if($ENV{'CURL_ENTROPY'});
-    $ENV{'CURL_FORCETIME'}=1; # for debug NTLM magic
+    $ENV{'CURL_FORCETIME'} = 1; # for debug NTLM magic
-    $ENV{'CURL_GLOBAL_INIT'}=1; # debug curl_global_init/cleanup use
+    $ENV{'CURL_GLOBAL_INIT'} = 1; # debug curl_global_init/cleanup use
-    $ENV{'HOME'}=$pwd;
+    $ENV{'HOME'} = $pwd;
-    $ENV{'CURL_HOME'}=$ENV{'HOME'};
+    $ENV{'CURL_HOME'} = $ENV{'HOME'};
-    $ENV{'XDG_CONFIG_HOME'}=$ENV{'HOME'};
+    $ENV{'XDG_CONFIG_HOME'} = $ENV{'HOME'};
-    $ENV{'COLUMNS'}=79; # screen width!
+    $ENV{'COLUMNS'} = 79; # screen width!
 
     # Incorporate the $logdir into the random seed and re-seed the PRNG.
     # This gives each runner a unique yet consistent seed which provides
@@ -262,8 +262,8 @@ sub event_loop {
 # Check for a command in the PATH of the machine running curl.
 #
 sub checktestcmd {
-    my ($cmd)=@_;
+    my ($cmd) = @_;
-    my @testpaths=($LIBDIR . ".libs", $LIBDIR);
+    my @testpaths = ($LIBDIR . ".libs", $LIBDIR);
     return checkcmd($cmd, @testpaths);
 }
 
@@ -452,7 +452,7 @@ sub torture {
     logmsg " CMD: $testcmd\n" if($verbose);
 
     # memanalyze -v is our friend, get the number of allocations made
-    my $count=0;
+    my $count = 0;
     my @out = memanalyze("$LOGDIR/$MEMDUMP", 1, 0, 0);
     for(@out) {
         if(/^Operations: (\d+)/) {
@@ -498,7 +498,7 @@ sub torture {
         }
 
         if($verbose) {
-            my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+            my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) =
                 localtime(time());
             my $now = sprintf("%02d:%02d:%02d ", $hour, $min, $sec);
             logmsg "Fail function no: $limit at $now\r";
@@ -550,16 +550,16 @@ sub torture {
         # and does not core dump
         if(($ret & 255) || ($ret >> 8) >= 128) {
             logmsg " system() returned $ret\n";
-            $fail=1;
+            $fail = 1;
         }
         else {
             my @memdata = memanalyze("$LOGDIR/$MEMDUMP", 0, 0, 0);
-            my $leak=0;
+            my $leak = 0;
             for(@memdata) {
                 if($_ ne "") {
                     # well it could be other memory problems as well, but
                     # we call it leak for short here
-                    $leak=1;
+                    $leak = 1;
                 }
             }
             if($leak) {
@@ -753,9 +753,9 @@ sub singletest_prepare {
 
     # create (possibly-empty) files before starting the test
     for my $partsuffix (('', '1', '2', '3', '4')) {
-        my @inputfile=getpart("client", "file".$partsuffix);
+        my @inputfile = getpart("client", "file".$partsuffix);
         my %fileattr = getpartattr("client", "file".$partsuffix);
-        my $filename=$fileattr{'name'};
+        my $filename = $fileattr{'name'};
         if(@inputfile || $filename) {
             if(!$filename) {
                 logmsg " $testnum: IGNORED: Section client=>file has no name attribute\n";
@@ -812,25 +812,25 @@ sub singletest_run {
     }
     else {
         # there was no command given, use something silly
-        $cmd="-";
+        $cmd = "-";
     }
 
-    my $CURLOUT="$LOGDIR/curl$testnum.out"; # curl output if not stdout
+    my $CURLOUT = "$LOGDIR/curl$testnum.out"; # curl output if not stdout
 
     # if stdout section exists, we verify that the stdout contained this:
-    my $out="";
+    my $out = "";
     my %cmdhash = getpartattr("client", "command");
     if((!$cmdhash{'option'}) || ($cmdhash{'option'} !~ /no-output/)) {
         #We may slap on --output!
         if(!partexists("verify", "stdout") ||
                 ($cmdhash{'option'} && $cmdhash{'option'} =~ /force-output/)) {
-            $out=" --output $CURLOUT ";
+            $out = " --output $CURLOUT ";
         }
     }
 
     my @codepieces = getpart("client", "tool");
-    my $tool="";
+    my $tool = "";
-    my $tool_name="";  # without exe extension
+    my $tool_name = "";  # without exe extension
     if(@codepieces) {
         $tool_name = $codepieces[0];
         chomp $tool_name;
@@ -839,27 +839,27 @@ sub singletest_run {
 
     my $oldmemdebug;
     my $disablevalgrind;
-    my $CMDLINE="";
+    my $CMDLINE = "";
     my $cmdargs;
     my $cmdtype = $cmdhash{'type'} || "default";
     my $fail_due_event_based = $run_event_based;
     if($cmdtype eq "perl") {
         # run the command line prepended with "perl"
-        $cmdargs =$cmd;
+        $cmdargs = $cmd;
         $CMDLINE = "$perl ";
-        $tool=$CMDLINE;
+        $tool = $CMDLINE;
-        $disablevalgrind=1;
+        $disablevalgrind = 1;
     }
     elsif($cmdtype eq "shell") {
         # run the command line prepended with "/bin/sh"
-        $cmdargs =$cmd;
+        $cmdargs = $cmd;
         $CMDLINE = "/bin/sh ";
-        $tool=$CMDLINE;
+        $tool = $CMDLINE;
-        $disablevalgrind=1;
+        $disablevalgrind = 1;
     }
     elsif(!$tool && !$keywords{"unittest"}) {
         # run curl, add suitable command line options
-        my $inc="";
+        my $inc = "";
         if((!$cmdhash{'option'}) || ($cmdhash{'option'} !~ /no-include/)) {
             $inc = " --include";
         }
@@ -899,21 +899,21 @@ sub singletest_run {
 
         # Default the tool to a unit test with the same name as the test spec
         if($keywords{"unittest"} && !$tool) {
-            $tool_name="unit$testnum";
+            $tool_name = "unit$testnum";
             $tool = $tool_name . exe_ext('TOOL');
         }
 
         if($tool =~ /^lib/) {
             $tool = "libtests" . exe_ext('TOOL');
-            $CMDLINE=$LIBDIR . $tool;
+            $CMDLINE = $LIBDIR . $tool;
         }
         elsif($tool =~ /^tool/) {
             $tool = "tunits" . exe_ext('TOOL');
-            $CMDLINE=$TUNITDIR . $tool;
+            $CMDLINE = $TUNITDIR . $tool;
         }
         elsif($tool =~ /^unit/) {
             $tool = "units" . exe_ext('TOOL');
-            $CMDLINE=$UNITDIR . $tool;
+            $CMDLINE = $UNITDIR . $tool;
         }
 
         if(! -f $CMDLINE) {
@@ -921,16 +921,16 @@ sub singletest_run {
             return (-1, 0, 0, "", "", 0);
         }
 
-        $CMDLINE=exerunner() . $CMDLINE;
+        $CMDLINE = exerunner() . $CMDLINE;
 
         if($gdbthis) {
-            $cmdargs =" $tool_name$cmdargs";
+            $cmdargs = " $tool_name$cmdargs";
         }
         else {
-            $CMDLINE.=" $tool_name";
+            $CMDLINE .= " $tool_name";
         }
 
-        $DBGCURL=$CMDLINE;
+        $DBGCURL = $CMDLINE;
     }
 
     if($fail_due_event_based) {
@@ -942,13 +942,13 @@ sub singletest_run {
         # gdb is incompatible with valgrind, so disable it when debugging
         # Perhaps a better approach would be to run it under valgrind anyway
         # with --db-attach=yes or --vgdb=yes.
-        $disablevalgrind=1;
+        $disablevalgrind = 1;
     }
 
     my @stdintest = getpart("client", "stdin");
 
     if(@stdintest) {
-        my $stdinfile="$LOGDIR/stdin-for-$testnum";
+        my $stdinfile = "$LOGDIR/stdin-for-$testnum";
 
         my %hash = getpartattr("client", "stdin");
         if($hash{'nonewline'}) {
@@ -966,7 +966,7 @@ sub singletest_run {
     }
 
     if(!$tool) {
-        $CMDLINE=exerunner() . shell_quote($CURL);
+        $CMDLINE = exerunner() . shell_quote($CURL);
         if((!$cmdhash{'option'}) || ($cmdhash{'option'} !~ /no-q/)) {
             $CMDLINE .= " -q";
         }
@@ -1038,13 +1038,13 @@ sub singletest_run {
         # gdb
         my $GDBW = ($gdbxwin) ? "-w" : "";
         runclient("$gdb --directory $LIBDIR " . shell_quote($DBGCURL) . " $GDBW -x $LOGDIR/gdbcmd");
-        $cmdres=0; # makes it always continue after a debugged run
+        $cmdres = 0; # makes it always continue after a debugged run
     }
     elsif($gdbthis == 2) {
         # $gdb is "lldb"
         print "runs lldb -- $CURL $cmdargs\n";
         runclient("lldb -- $CURL $cmdargs");
-        $cmdres=0; # makes it always continue after a debugged run
+        $cmdres = 0; # makes it always continue after a debugged run
     }
     else {
         # Convert the raw result code into a more useful one
@@ -1065,7 +1065,7 @@ sub singletest_run {
 #######################################################################
 # Clean up after test command
 sub singletest_clean {
-    my ($testnum, $dumped_core, $testtimings)=@_;
+    my ($testnum, $dumped_core, $testtimings) = @_;
 
     if(!$dumped_core) {
         if(-r "core") {
@@ -1138,15 +1138,15 @@ sub singletest_clean {
 #######################################################################
 # Verify that the postcheck succeeded
 sub singletest_postcheck {
-    my ($testnum)=@_;
+    my ($testnum) = @_;
 
     # run the postcheck command
-    my @postcheck= getpart("client", "postcheck");
+    my @postcheck = getpart("client", "postcheck");
     if(@postcheck) {
         die "test$testnum uses client/postcheck";
     }
 
-    @postcheck= getpart("verify", "postcheck");
+    @postcheck = getpart("verify", "postcheck");
     if(@postcheck) {
         my $cmd = join("", @postcheck);
         chomp $cmd;
@@ -1173,7 +1173,7 @@ sub singletest_postcheck {
 ###################################################################
 # Get ready to run a single test case
 sub runner_test_preprocess {
-    my ($testnum)=@_;
+    my ($testnum) = @_;
     my %testtimings;
 
     if(clearlogs()) {
@@ -1233,7 +1233,7 @@ sub runner_test_preprocess {
 #   1=unskippable test failure, as first integer, plus any log messages,
 #   plus more return values when error is 0
 sub runner_test_run {
-    my ($testnum)=@_;
+    my ($testnum) = @_;
 
     if(clearlogs()) {
         logmsg "Warning: log messages were lost\n";
@@ -1285,7 +1285,7 @@ sub runner_test_run {
 # received.
 # Called by controller
 sub runnerac_shutdown {
-    my ($runnerid)=$_[0];
+    my ($runnerid) = $_[0];
     my $err = controlleripccall(\&runner_shutdown, @_);
 
     # These have no more use
@@ -1362,7 +1362,7 @@ sub runnerar {
         }
         # system call was interrupted, probably by ^C; restart it so we stay in sync
     }
-    my $len=unpack("L", $datalen);
+    my $len = unpack("L", $datalen);
     my $buf;
     while(! defined ($err = sysread($controllerr{$runnerid}, $buf, $len)) || $err <= 0) {
         if((!defined $err && ! $!{EINTR}) || (defined $err && $err == 0)) {
@@ -1391,7 +1391,7 @@ sub runnerar_ready {
     my ($blocking) = @_;
     my $r_in = "";
     my %idbyfileno;
-    my $maxfileno=0;
+    my $maxfileno = 0;
     my @ready_runners = ();
     foreach my $p (keys(%controllerr)) {
         my $fd = fileno($controllerr{$p});
@@ -1408,7 +1408,7 @@ sub runnerar_ready {
     # caller will need to later call this function again.
     # TODO: this is relatively slow with hundreds of fds
     my $e_in = $r_in;
-    if(select(my $r_out=$r_in, undef, my $e_out=$e_in, $blocking) >= 1) {
+    if(select(my $r_out = $r_in, undef, my $e_out = $e_in, $blocking) >= 1) {
         for my $fd (0..$maxfileno) {
             # Return an error condition first in case it is both
             if(vec($e_out, $fd, 1)) {
@@ -1451,7 +1451,7 @@ sub ipcrecv {
         }
         # system call was interrupted, probably by ^C; restart it so we stay in sync
     }
-    my $len=unpack("L", $datalen);
+    my $len = unpack("L", $datalen);
     my $buf;
     while(! defined ($err = sysread($runnerr, $buf, $len)) || $err <= 0) {
         if((!defined $err && ! $!{EINTR}) || (defined $err && $err == 0)) {

tests/servers.pm

@@ -1899,7 +1899,7 @@ sub runsshserver {
        !close($hostfile) ||
        ($SSHSRVMD5 !~ /^[a-f0-9]{32}$/i))
     {
-        my $msg = "Fatal: $srvrname pubkey md5 missing : \"$hstpubmd5f\" : $!";
+        my $msg = "Fatal: $srvrname pubkey MD5 missing : \"$hstpubmd5f\" : $!";
         logmsg "$msg\n";
         stopservers($verb);
         die $msg;
@@ -1909,7 +1909,7 @@ sub runsshserver {
        (read($hostfile, $SSHSRVSHA256, 48) == 0) ||
        !close($hostfile))
     {
-        my $msg = "Fatal: $srvrname pubkey sha256 missing : \"$hstpubsha256f\" : $!";
+        my $msg = "Fatal: $srvrname pubkey SHA256 missing : \"$hstpubsha256f\" : $!";
         logmsg "$msg\n";
         stopservers($verb);
         die $msg;

tests/sshserver.pl

@@ -446,21 +446,21 @@ if((! -e pp($hstprvkeyf)) || (! -s pp($hstprvkeyf)) ||
     my @rsahostkey = do { local $/ = ' '; <$rsakeyfile> };
     close($rsakeyfile);
     if(!$rsahostkey[1]) {
-        logmsg "Failed parsing base64 encoded RSA host key\n";
+        logmsg "Failed parsing base64 encoded SSH host key\n";
         exit 1;
     }
     open(my $pubmd5file, ">", pp($hstpubmd5f));
     print $pubmd5file md5_hex(decode_base64($rsahostkey[1]));
     close($pubmd5file);
     if((! -e pp($hstpubmd5f)) || (! -s pp($hstpubmd5f))) {
-        logmsg "Failed writing md5 hash of RSA host key\n";
+        logmsg "Failed writing MD5 hash of SSH host key\n";
         exit 1;
     }
     open(my $pubsha256file, ">", pp($hstpubsha256f));
     print $pubsha256file sha256_base64(decode_base64($rsahostkey[1]));
     close($pubsha256file);
     if((! -e pp($hstpubsha256f)) || (! -s pp($hstpubsha256f))) {
-        logmsg "Failed writing sha256 hash of RSA host key\n";
+        logmsg "Failed writing SHA256 hash of SSH host key\n";
         exit 1;
     }
 }

tests/test1119.pl

@@ -81,7 +81,7 @@ sub scanenum {
 
 sub scanheader {
     my ($f)=@_;
-    open my $h, "<", $f;
+    open(my $h, "<", $f);
     while(<$h>) {
         if(/^#define ((LIB|)CURL[A-Za-z0-9_]*)/) {
             push @syms, $1;
@@ -120,7 +120,7 @@ sub checkmanpage {
             my $s = $1;
             # skip two "special" ones
             if($s !~ /(^(CURLE_OBSOLETE|CURLOPT_TEMPLATE))|_$/) {
-                push @manrefs, "$1:$m:$line";
+                push @manrefs, "$s:$m:$line";
             }
         }
         $line++;
@@ -143,7 +143,7 @@ scanallheaders();
 scanman_md_dir("$root/docs/libcurl");
 scanman_md_dir("$root/docs/libcurl/opts");
 
-open my $s, "<", "$root/docs/libcurl/symbols-in-versions";
+open(my $s, "<", "$root/docs/libcurl/symbols-in-versions");
 while(<$s>) {
     if(/(^[^ \n]+) +(.*)/) {
         my ($sym, $rest)=($1, $2);

tests/test1167.pl

@@ -119,7 +119,7 @@ sub scanenums {
 sub scanheader {
     my ($f)=@_;
     scanenums($f);
-    open H, "<$f";
+    open(H, '<', $f);
     while(<H>) {
         my ($line, $linenum) = ($_, $.);
         if(/^ *# *define +([^ \n]*)/) {

tests/tunit/tool1394.c

@@ -22,7 +22,6 @@
  *
  ***************************************************************************/
 #include "unitcheck.h"
-
 #include "tool_getparam.h"
 
 static CURLcode test_tool1394(const char *arg)

tests/tunit/tool1604.c

@@ -24,7 +24,6 @@
 #include "unitcheck.h"
 
 #if defined(_WIN32) || defined(MSDOS)
-
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 

tests/tunit/tool1621.c

@@ -22,7 +22,6 @@
  *
  ***************************************************************************/
 #include "unitcheck.h"
-
 #include "tool_xattr.h"
 
 static CURLcode test_tool1621(const char *arg)

tests/tunit/tool1622.c

@@ -22,7 +22,6 @@
  *
  ***************************************************************************/
 #include "unitcheck.h"
-
 #include "tool_progress.h"
 
 static CURLcode test_tool1622(const char *arg)

tests/tunit/tool1623.c

@@ -22,7 +22,6 @@
  *
  ***************************************************************************/
 #include "unitcheck.h"
-
 #include "tool_getparam.h"
 
 struct check1623 {

tests/unit/unit1300.c

@@ -22,7 +22,6 @@
  *
  ***************************************************************************/
 #include "unitcheck.h"
-
 #include "llist.h"
 
 static void test_Curl_llist_dtor(void *key, void *value)