dec546cde4

.clang-tidy.yml+1 -1

@@ -41,7 +41,7 @@ Checks:
	# readability-enum-initial-value
	# readability-function-cognitive-complexity
	- readability-inconsistent-declaration-parameter-name
-	# readability-misleading-indentation # too many false positives and oddball/conditional source
+	# readability-misleading-indentation # too many false positives in oddball/conditional source
	- readability-named-parameter
	# readability-redundant-casting # false positives in types that change from platform to platform, even with IgnoreTypeAliases: true
	- readability-redundant-control-flow

CMake/PickyWarnings.cmake+1 -1

@@ -215,7 +215,7 @@ if(PICKY_COMPILER)
	if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0) OR
	(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12))
	list(APPEND _picky_enable
-	-Wimplicit-fallthrough # clang 4.0 gcc 7.0 appleclang 9.0 # We do silencing for clang 10.0 and above only
+	-Wimplicit-fallthrough # clang 4.0 gcc 7.0 appleclang 9.0 # We do silencing for clang 10.0+ only
	-Wxor-used-as-pow # clang 10.0 gcc 13.0 appleclang 12.0
	)
	endif()

CMakeLists.txt+4 -4

@@ -895,7 +895,7 @@ endif()
	if(CURL_USE_MBEDTLS)
	find_package(MbedTLS MODULE REQUIRED)
	if(MBEDTLS_VERSION VERSION_LESS 3.2.0)
-	message(FATAL_ERROR "mbedTLS 3.2.0 or greater required.")
+	message(FATAL_ERROR "mbedTLS 3.2.0 or greater required")
	endif()
	set(_ssl_enabled ON)
	set(USE_MBEDTLS ON)
@@ -929,7 +929,7 @@ if(CURL_USE_WOLFSSL)
	set(_curl_ca_bundle_supported TRUE)

	if(USE_OPENSSL AND WOLFSSL_VERSION VERSION_LESS 5.7.6)
-	message(FATAL_ERROR "wolfSSL 5.7.6 or greater required to coexist with OpenSSL.")
+	message(FATAL_ERROR "wolfSSL 5.7.6 or greater required to coexist with OpenSSL")
	endif()

	set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "WOLFSSL_OPTIONS_IGNORE_SYS")
@@ -1005,7 +1005,7 @@ if(ZSTD_FOUND)
	set(HAVE_ZSTD ON)
	list(APPEND CURL_LIBS CURL::zstd)
	else()
-	message(WARNING "zstd 1.0.0 or greater required, disabling zstd support.")
+	message(WARNING "zstd 1.0.0 or greater required, disabling zstd support")
	endif()
	endif()

@@ -1337,7 +1337,7 @@ mark_as_advanced(CURL_USE_GSASL)
	if(CURL_USE_GSASL)
	find_package(Libgsasl MODULE REQUIRED)
	if(LIBGSASL_VERSION VERSION_LESS 1.6.0)
-	message(FATAL_ERROR "libgsasl 1.6.0 or greater required.")
+	message(FATAL_ERROR "libgsasl 1.6.0 or greater required")
	endif()
	list(APPEND CURL_LIBS CURL::libgsasl)
	set(USE_GSASL ON)

lib/api.h+2 -2

@@ -134,6 +134,7 @@ typedef enum {
	CURL_CBAPI_FN_LAST
	} Curl_cbapi_fn;

+	/* EAPI */

	#define CURL_EAPI_MAX_RECURSION 7

@@ -163,6 +164,7 @@ CURLHcode Curl_eapi_hcode(CURLcode result);
	#define CURL_EAPI_LEAVE(g) \
	Curl_eapi_leave(g)

+	/* MAPI */

	#define CURL_MAPI_MAX_RECURSION 15

@@ -189,7 +191,6 @@ void Curl_mapi_leave(struct Curl_mapi_guard *guard);
	#define CURL_MAPI_LEAVE(g) \
	Curl_mapi_leave(g)

-
	void Curl_cbapi_enter(struct Curl_mapi_guard *guard,
	struct Curl_easy *data,
	struct Curl_multi *multi,
@@ -205,7 +206,6 @@ void Curl_cbapi_leave(struct Curl_mapi_guard *guard);
	#define CURL_CBAPI_MULTI_END(g) \
	Curl_cbapi_leave(g)

-
	bool Curl_api_is_in_callback(struct Curl_easy *data);
	bool Curl_api_multi_is_in_callback(struct Curl_multi *multi);

lib/cf-socket.c+2 -4

@@ -1149,7 +1149,6 @@ static int cf_socktype(int x)
	}

	#ifdef _WIN32
-
	/* Offered by mingw-w64 v10+, MS SDK 8.0/~VS2012+ */
	#ifndef SIO_TCP_INITIAL_RTO
	#define SIO_TCP_INITIAL_RTO _WSAIOW(IOC_VENDOR, 17)
@@ -1160,7 +1159,7 @@ typedef struct _TCP_INITIAL_RTO_PARAMETERS {
	USHORT Rtt;
	UCHAR MaxSynRetransmissions;
	} TCP_INITIAL_RTO_PARAMETERS;
-	#endif
+	#endif /* SIO_TCP_INITIAL_RTO */

	#ifndef TCP_INITIAL_RTO_NO_SYN_RETRANSMISSIONS
	#define TCP_INITIAL_RTO_NO_SYN_RETRANSMISSIONS 0xFE /* -2 */
@@ -1191,7 +1190,7 @@ static void tcplocalhost(struct Curl_cfilter *cf,
	}
	#else
	#define tcplocalhost(x, y)
-	#endif
+	#endif /* _WIN32 */

	static CURLcode cf_socket_open(struct Curl_cfilter *cf,
	struct Curl_easy *data)
@@ -1987,7 +1986,6 @@ static void linux_ip_dontfrag(struct cf_socket_ctx *ctx)
	#define linux_ip_dontfrag(x)
	#endif

-
	static CURLcode cf_udp_setup_quic(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{

lib/config-mac.h+1 -1

@@ -25,7 +25,7 @@
	***************************************************************************/

	/* =================================================================== */
-	/* Hand crafted config file for Mac OS 9 */
+	/* Handcrafted config file for Mac OS 9 */
	/* =================================================================== */
	/* On macOS you must run configure to generate curl_config.h file */
	/* =================================================================== */

lib/config-os400.h+1 -1

@@ -25,7 +25,7 @@
	***************************************************************************/

	/* ================================================================ */
-	/* Hand crafted config file for OS/400 */
+	/* Handcrafted config file for OS/400 */
	/* ================================================================ */

	#pragma enum(int)

lib/cookie.c+0 -1

@@ -1052,7 +1052,6 @@ CURLcode Curl_cookie_add(struct Curl_easy *data,
	co->livecookie = ci->running;
	co->creationtime = ++ci->lastct;

-
	if(!(flags & COOKIE_NOEXPIRE))
	remove_expired(ci);

lib/easy.c+1 -1

@@ -169,7 +169,7 @@ static CURLcode global_init(long flags, bool memoryfuncs)
	}

	if(Curl_async_global_init()) {
-	DEBUGF(curl_mfprintf(stderr, "Error: resolver_global_init failed\n"));
+	DEBUGF(curl_mfprintf(stderr, "Error: Curl_async_global_init failed\n"));
	goto fail;
	}

lib/protocol.c+0 -1

@@ -462,7 +462,6 @@ const struct Curl_scheme Curl_scheme_wss = {
	PORT_HTTPS /* defport */
	};

-
	static const struct Curl_scheme two_letter_scheme(const char scheme)
	{
	if((Curl_raw_tolower(scheme[0]) == 'w') &&

lib/setopt.c+1 -1

@@ -1869,7 +1869,7 @@ static CURLcode setopt_ech(struct Curl_easy data, const char ptr)
	return result;
	}
	#else
-	#define setopt_ech(x,y) CURLE_NOT_BUILT_IN
+	#define setopt_ech(x, y) CURLE_NOT_BUILT_IN
	#endif

	#if defined(USE_SSL) \|\| defined(USE_SSH)

lib/uint-hashset.c+0 -1

@@ -237,7 +237,6 @@ CURLcode Curl_u8_strset_setn(struct u8_strset *set,
	return CURLE_OK;
	}

-
	CURLcode Curl_u8_strset_setx(struct u8_strset *set,
	uint8_t id, const char *str, size_t slen)
	{

lib/urldata.h+5 -5

@@ -1225,15 +1225,15 @@ struct Curl_easy {
	};

	#define CURL_EASY_STR(d, id) \
-	Curl_u8_strset_get(&(d)->set.strings, (uint8_t)(id))
+	Curl_u8_strset_get(&(d)->set.strings, (uint8_t)(id))
	#define CURL_EASY_STR_SET(d, id, s, slen) \
-	Curl_u8_strset_setx(&(d)->set.strings, (uint8_t)(id), (s), (slen))
+	Curl_u8_strset_setx(&(d)->set.strings, (uint8_t)(id), (s), (slen))
	#define CURL_EASY_STR_SETN(d, id, s) \
-	Curl_u8_strset_setn(&(d)->set.strings, (uint8_t)(id), (s))
+	Curl_u8_strset_setn(&(d)->set.strings, (uint8_t)(id), (s))
	#define CURL_EASY_STR_CLEAR(d, id) \
-	Curl_u8_strset_unset(&(d)->set.strings, (uint8_t)(id))
+	Curl_u8_strset_unset(&(d)->set.strings, (uint8_t)(id))
	#define CURL_EASY_STR_CLEAR0(d, id) \
-	Curl_u8_strset_unset0(&(d)->set.strings, (uint8_t)(id))
+	Curl_u8_strset_unset0(&(d)->set.strings, (uint8_t)(id))

	#define LIBCURL_NAME "libcurl"

lib/vdns/asyn-base.c+1 -1

@@ -266,7 +266,7 @@ CURLcode Curl_async_failed(struct Curl_easy *data,
	}
	#endif

-	if(async->dns_queries & (CURL_DNSQ_A\|CURL_DNSQ_AAAA))
+	if(async->dns_queries & (CURL_DNSQ_A \| CURL_DNSQ_AAAA))
	failf(data, "Could not resolve %s: %s%s%s%s",
	host_or_proxy, async->peer->hostname,
	detail ? " (" : "", detail ? detail : "", detail ? ")" : "");

lib/vdns/cf-dns.c+8 -10

@@ -237,7 +237,7 @@ static CURLcode cf_dns_start(struct Curl_cfilter *cf,
	}
	else {
	DEBUGASSERT(result);
-	if(ctx->dns_queries & (CURL_DNSQ_A\|CURL_DNSQ_AAAA))
+	if(ctx->dns_queries & (CURL_DNSQ_A \| CURL_DNSQ_AAAA))
	failf(data, "Could not resolve: %s", ctx->peer->hostname);
	return result;
	}
@@ -287,7 +287,7 @@ static CURLcode cf_dns_connect(struct Curl_cfilter *cf,
	bool *done)
	{
	struct cf_dns_ctx *ctx = cf->ctx;
-	bool ip_query = (ctx->dns_queries & (CURL_DNSQ_A\|CURL_DNSQ_AAAA));
+	bool ip_query = (ctx->dns_queries & (CURL_DNSQ_A \| CURL_DNSQ_AAAA));

	if(cf->connected) {
	*done = TRUE;
@@ -436,8 +436,7 @@ static CURLcode cf_dns_create(struct Curl_cfilter **pcf,
	CURLcode result = CURLE_OK;

	(void)data;
-	ctx = cf_dns_ctx_create(data, peer, dns_queries, transport,
-	for_proxy);
+	ctx = cf_dns_ctx_create(data, peer, dns_queries, transport, for_proxy);
	if(!ctx) {
	result = CURLE_OUT_OF_MEMORY;
	goto out;
@@ -582,7 +581,7 @@ CURLcode Curl_conn_dns_addr_result(struct connectdata *conn,
	if(cf->cft == &Curl_cft_dns) {
	struct cf_dns_ctx *ctx = cf->ctx;
	if(Curl_peer_same_destination(ctx->peer, peer) &&
-	(ctx->dns_queries & (CURL_DNSQ_A\|CURL_DNSQ_AAAA))) {
+	(ctx->dns_queries & (CURL_DNSQ_A \| CURL_DNSQ_AAAA))) {
	if(ctx->dns \|\| ctx->resolv_result)
	return ctx->resolv_result;
	return CURLE_AGAIN;
@@ -609,7 +608,7 @@ const struct Curl_addrinfo Curl_conn_dns_get_ai(struct Curl_easy data,
	if(cf->cft == &Curl_cft_dns) {
	struct cf_dns_ctx *ctx = cf->ctx;
	if(Curl_peer_same_destination(ctx->peer, peer) &&
-	(ctx->dns_queries & (CURL_DNSQ_A\|CURL_DNSQ_AAAA))) {
+	(ctx->dns_queries & (CURL_DNSQ_A \| CURL_DNSQ_AAAA))) {
	CURL_TRC_CF(data, cf, "get %uth result for %s:%u, family=%d, dns=%d",
	index, peer->hostname, peer->port, ai_family, !!ctx->dns);
	if(ctx->resolv_result)
@@ -647,10 +646,9 @@ CURLcode Curl_conn_dns_add_https_resolve(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 *
-	Curl_conn_dns_get_https(struct Curl_easy *data,
-	int8_t sockindex,
-	struct Curl_peer *peer)
+	const struct Curl_https_rrinfo Curl_conn_dns_get_https(struct Curl_easy data,
+	int8_t sockindex,
+	struct Curl_peer *peer)
	{
	struct Curl_cfilter *cf = data->conn->cfilter[sockindex];
	for(; cf; cf = cf->next) {

lib/vdns/dnscache.c+17 -23

@@ -75,7 +75,7 @@ static void dnsc_peer2id(struct dnsc_id *pid, char type,
	}

	static void dnsc_str2id(struct dnsc_id *pid, char type,
-	struct Curl_str *name, uint16_t port)
+	struct Curl_str *name, uint16_t port)
	{
	pid->name = *name;
	pid->port = port;
@@ -104,7 +104,6 @@ static void dnsc_id2key(struct dnsc_key key, struct dnsc_id id)
	curl_msnprintf(&key->data[namelen + 1], 7, ":%u", id->port);
	}

-
	static void dnscache_entry_free(struct Curl_dns_entry *dns)
	{
	Curl_freeaddrinfo(dns->addr);
@@ -430,8 +429,7 @@ UNITTEST CURLcode dns_shuffle_addr(struct Curl_easy *data,
	}
	#endif

-	static bool dnscache_ai_has_family(struct Curl_addrinfo *ai,
-	int ai_family)
+	static bool dnscache_ai_has_family(struct Curl_addrinfo *ai, int ai_family)
	{
	for(; ai; ai = ai->ai_next) {
	if(ai->ai_family == ai_family)
@@ -470,8 +468,7 @@ out:
	return dns;
	}

-	static struct Curl_dns_entry *
-	dnsc_entry_assign_addr(
+	static struct Curl_dns_entry *dnsc_entry_assign_addr(
	struct Curl_easy *data,
	struct Curl_dns_entry *dns,
	uint8_t dns_queries,
@@ -569,9 +566,9 @@ struct Curl_dns_entry Curl_dnsc_mk_addr2(struct Curl_easy data,
	}

	#ifdef USE_HTTPSRR
-	static struct Curl_dns_entry *
-	dnsc_entry_assign_https(struct Curl_dns_entry *dns,
-	struct Curl_https_rrinfo **phinfo)
+	static struct Curl_dns_entry *dnsc_entry_assign_https(
+	struct Curl_dns_entry *dns,
+	struct Curl_https_rrinfo **phinfo)
	{
	if(!dns)
	goto out;
@@ -633,10 +630,9 @@ static struct Curl_dns_entry dnsc_add_https(struct Curl_easy data,
	}

	dns = dns2;
-	dns->refcount++; /* mark entry as in-use */
+	dns->refcount++; /* mark entry as in-use */
	return dns;
	}
-
	#endif /* USE_HTTPSRR */

	static struct Curl_dns_entry dnsc_add_addr(struct Curl_easy data,
@@ -663,17 +659,17 @@ static struct Curl_dns_entry dnsc_add_addr(struct Curl_easy data,
	}

	dns = dns2;
-	dns->refcount++; /* mark entry as in-use */
+	dns->refcount++; /* mark entry as in-use */
	return dns;
	}

-	static struct Curl_dns_entry *
-	dnsc_add_peer_addr(struct Curl_easy *data,
-	struct Curl_dnscache *dnscache,
-	uint8_t dns_queries,
-	struct Curl_addrinfo **paddr,
-	struct dnsc_id *id,
-	bool permanent)
+	static struct Curl_dns_entry *dnsc_add_peer_addr(
+	struct Curl_easy *data,
+	struct Curl_dnscache *dnscache,
+	uint8_t dns_queries,
+	struct Curl_addrinfo **paddr,
+	struct dnsc_id *id,
+	bool permanent)
	{
	struct Curl_dns_entry *dns;
	struct Curl_dns_entry *dns2;
@@ -684,7 +680,6 @@ dnsc_add_peer_addr(struct Curl_easy *data,
	if(!dns)
	return NULL;

-
	/* Store the resolved data in our DNS cache. */
	dnsc_id2key(&key, id);
	dns2 = Curl_hash_add(&dnscache->entries, key.data, key.len, (void *)dns);
@@ -694,7 +689,7 @@ dnsc_add_peer_addr(struct Curl_easy *data,
	}

	dns = dns2;
-	dns->refcount++; /* mark entry as in-use */
+	dns->refcount++; /* mark entry as in-use */
	return dns;
	}

@@ -968,8 +963,7 @@ err:

	if(dns) {
	infof(data, "RESOLVE %.*s:%u - old addresses discarded",
-	(int)curlx_strlen(&source),
-	curlx_str(&source), port);
+	(int)curlx_strlen(&source), curlx_str(&source), port);
	/* delete old entry, there are two reasons for this
	1. old entry may have different addresses.
	2. even if entry with correct addresses is already in the cache,

lib/vdns/dnscache.h+7 -7

@@ -70,15 +70,15 @@ struct Curl_dns_entry {
	* Returns entry or NULL on OOM.
	*/
	struct Curl_dns_entry Curl_dnsc_mk_addr(struct Curl_easy data,
-	uint8_t dns_queries,
-	struct Curl_addrinfo **paddr,
-	struct Curl_peer *peer);
+	uint8_t dns_queries,
+	struct Curl_addrinfo **paddr,
+	struct Curl_peer *peer);

	struct Curl_dns_entry Curl_dnsc_mk_addr2(struct Curl_easy data,
-	uint8_t dns_queries,
-	struct Curl_addrinfo **paddr1,
-	struct Curl_addrinfo **paddr2,
-	struct Curl_peer *peer);
+	uint8_t dns_queries,
+	struct Curl_addrinfo **paddr1,
+	struct Curl_addrinfo **paddr2,
+	struct Curl_peer *peer);

	#ifdef USE_HTTPSRR
	struct Curl_dns_entry Curl_dnsc_mk_https(struct Curl_easy data,

lib/vdns/hostip.c+3 -3

@@ -570,7 +570,7 @@ static CURLcode hostip_resolv_start(struct Curl_easy *data,
	#endif
	struct Curl_addrinfo *addr = NULL;
	size_t hostname_len;
-	bool addr_queries = (dns_queries & (CURL_DNSQ_A\|CURL_DNSQ_AAAA));
+	bool addr_queries = (dns_queries & (CURL_DNSQ_A \| CURL_DNSQ_AAAA));
	CURLcode result = CURLE_OK;

	*pnegative = FALSE;
@@ -769,7 +769,7 @@ out:
	if(IS_RESOLV_FAIL(result)) {
	if(cache_dns && negative)
	Curl_dnscache_add_negative(data, dns_queries, peer);
-	if(dns_queries & (CURL_DNSQ_A\|CURL_DNSQ_AAAA))
+	if(dns_queries & (CURL_DNSQ_A \| CURL_DNSQ_AAAA))
	failf(data, "Could not resolve: %s:%u", peer->hostname, peer->port);
	}
	else {
@@ -1120,7 +1120,7 @@ CURLcode Curl_resolv_take_result(struct Curl_easy *data, uint32_t resolv_id,
	transfer using it. */
	if(async->negative_answer)
	Curl_dnscache_add_negative(data, async->dns_queries, async->peer);
-	if(async->dns_queries & (CURL_DNSQ_A\|CURL_DNSQ_AAAA))
+	if(async->dns_queries & (CURL_DNSQ_A \| CURL_DNSQ_AAAA))
	failf(data, "Could not resolve: %s:%u",
	async->peer->hostname, async->peer->port);
	}

lib/vquic/cf-ngtcp2-cmn.c+0 -1

@@ -2034,7 +2034,6 @@ CURLcode Curl_cf_ngtcp2_h3_init_ctrls(struct cf_ngtcp2_ctx *ctx,
	return CURLE_OK;
	}

-
	CURLcode Curl_cf_ngtcp2_cmn_query(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	int query, int pres1, void pres2)

lib/vquic/vquic.c+3 -3

@@ -565,8 +565,8 @@ static size_t vquic_msghdr_get_udp_gro(struct msghdr *msg)
	#endif /* (HAVE_SENDMMSG \|\| HAVE_SENDMSG) && !HAVE_APPLE_MSG_X */

	#if (defined(HAVE_SENDMMSG) \|\| defined(HAVE_SENDMSG) \|\| \
-	defined(HAVE_APPLE_MSG_X)) && \
-	(defined(IP_RECVTOS) \|\| defined(IP_TOS)) && defined(IPTOS_ECN_MASK)
+	defined(HAVE_APPLE_MSG_X)) && \
+	(defined(IP_RECVTOS) \|\| defined(IP_TOS)) && defined(IPTOS_ECN_MASK)
	static uint8_t vquic_msghdr_get_ecn(struct msghdr *msg, int family)
	{
	struct cmsghdr *cmsg;
@@ -618,7 +618,7 @@ static uint8_t vquic_msghdr_get_ecn(struct msghdr *msg, int family)
	return 0;
	}
	#else
-	#define vquic_msghdr_get_ecn(a,b) 0
+	#define vquic_msghdr_get_ecn(a, b) 0
	#endif /* HAVE_SENDMMSG \|\| HAVE_SENDMSG \|\| HAVE_APPLE_MSG_X ... */

	#ifdef HAVE_SENDMMSG

src/config2setopts.c+2 -2

@@ -214,11 +214,11 @@ static CURLcode ssh_setopts(struct OperationConfig config, CURL curl,
	MY_SETOPT_STR(curl, CURLOPT_SSH_PRIVATE_KEYFILE, config->key);
	MY_SETOPT_STR(curl, CURLOPT_SSH_PUBLIC_KEYFILE, config->pubkey);

-	/* SSH host key md5 checking allows us to fail if we are not talking to who
+	/* SSH host key MD5 checking allows us to fail if we are not talking to who
	we think we should */
	MY_SETOPT_STR(curl, CURLOPT_SSH_HOST_PUBLIC_KEY_MD5, config->hostpubmd5);

-	/* SSH host key sha256 checking allows us to fail if we are not talking to
+	/* SSH host key SHA256 checking allows us to fail if we are not talking to
	who we think we should */
	MY_SETOPT_STR(curl, CURLOPT_SSH_HOST_PUBLIC_KEY_SHA256,
	config->hostpubsha256);

src/curlinfo.c+1 -4

@@ -270,13 +270,10 @@ static const char * const disabled[] = {
	#endif
	};

-	int main(int argc, const char *argv[])
+	int main(void)
	{
	size_t i;

-	(void)argc;
-	(void)argv;
-
	for(i = 0; i < CURL_ARRAYSIZE(disabled); i++)
	puts(disabled[i]);

src/tool_operate.c+5 -6

@@ -2159,8 +2159,7 @@ static CURLcode serial_transfers(CURLSH *share)
	}
	}
	if(returncode)
-	/* returncode errors have priority */
-	result = returncode;
+	result = returncode; /* returncode errors have priority */

	if(result)
	single_transfer_cleanup();
@@ -2178,20 +2177,20 @@ static bool win32_using_schannel(CURLcode *resultp)
	1 = yes */
	*resultp = CURLE_OK;
	if(using_schannel == -1) {
-	CURL *curltls = curl_easy_init();
+	CURL *curl = curl_easy_init();
	/* The TLS backend remains, so keep the info */
	const struct curl_tlssessioninfo *tls_backend_info = NULL;

-	if(!curltls)
+	if(!curl)
	*resultp = CURLE_OUT_OF_MEMORY;
	else {
-	*resultp = curl_easy_getinfo(curltls, CURLINFO_TLS_SSL_PTR,
+	*resultp = curl_easy_getinfo(curl, CURLINFO_TLS_SSL_PTR,
	&tls_backend_info);
	if(!*resultp)
	using_schannel =
	(tls_backend_info->backend == CURLSSLBACKEND_SCHANNEL);
	}
-	curl_easy_cleanup(curltls);
+	curl_easy_cleanup(curl);
	if(*resultp)
	return TRUE;
	}

tests/server/util.c+4 -2

@@ -124,8 +124,7 @@ static void win32_cleanup(void)
	WSACleanup();
	#endif

-	/* flush buffers of all streams regardless of their mode */
-	_flushall();
+	_flushall(); /* flush buffers of all streams regardless of their mode */
	}

	int win32_init(void)
@@ -356,6 +355,9 @@ static SIGHANDLER_T old_sigterm_handler = SIG_ERR;
	* Only call signal-safe functions from the signal handler, as required by
	* the POSIX specification:
	* https://pubs.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_04.html#tag_02_04_03
+	* https://iafisher.com/2026/08/restart
+	* https://iafisher.com/2026/08/safe-signals
+	* https://lwn.net/Articles/414618/
	*/
	static void exit_signal_handler(int signum) /* keep signal-safe */
	{

Subject

Binary

Architecture & Compiler Flags

Build Log

Commit Diff GitHub →