← Commit list

aa66b02dd8

Viktor Szakats

2026-09-01

SUCCESS Duration: 400s

Subject

tidy-up: misc C and CMake nits

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

CMake/win32-cache.cmake+4 -3

@@ -42,16 +42,17 @@ else()
	set(HAVE_SYS_PARAM_H 0)
	set(HAVE_UTIME_H 0)
	if(MSVC)
-	set(HAVE_UNISTD_H 0)
+	set(HAVE_BASENAME 0)
	set(HAVE_STDDEF_H 1) # detected by CMake internally in check_type_size()
	set(HAVE_STDINT_H 1) # detected by CMake internally in check_type_size()
	if(MSVC_VERSION GREATER_EQUAL 1800)
+	set(HAVE_BOOL_T 1) # = HAVE_STDBOOL_H
	set(HAVE_STDBOOL_H 1)
	else()
+	set(HAVE_BOOL_T 0) # = HAVE_STDBOOL_H
	set(HAVE_STDBOOL_H 0)
	endif()
-	set(HAVE_BOOL_T "${HAVE_STDBOOL_H}")
-	set(HAVE_BASENAME 0)
+	set(HAVE_UNISTD_H 0)
	endif()
	endif()

docs/examples/ftpuploadfrommem.c+1 -1

@@ -78,7 +78,7 @@ int main(void)
	upload.sizeleft = strlen(data);

	/* In Windows, this inits the Winsock stuff */
-	result = curl_global_init(CURL_GLOBAL_DEFAULT);
+	result = curl_global_init(CURL_GLOBAL_ALL);
	/* Check for errors */
	if(result != CURLE_OK) {
	fprintf(stderr, "curl_global_init() failed: %s\n",

docs/examples/post-callback.c+1 -1

@@ -76,7 +76,7 @@ int main(void)
	wt.sizeleft = strlen(data);

	/* In Windows, this inits the Winsock stuff */
-	result = curl_global_init(CURL_GLOBAL_DEFAULT);
+	result = curl_global_init(CURL_GLOBAL_ALL);
	/* Check for errors */
	if(result != CURLE_OK) {
	fprintf(stderr, "curl_global_init() failed: %s\n",

lib/curl_sasl.c+1 -1

@@ -142,7 +142,7 @@ CURLcode Curl_sasl_parse_url_auth_option(struct SASL *sasl,
	void Curl_sasl_init(struct SASL sasl, struct Curl_easy data,
	const struct SASLproto *params)
	{
-	unsigned long auth = data->set.httpauth;
+	uint32_t auth = data->set.httpauth;

	sasl->params = params; /* Set protocol dependent parameters */
	sasl->state = SASL_STOP; /* Not yet running */

lib/multi.c+1 -1

@@ -1403,7 +1403,7 @@ static CURLMcode multi_winsock_select(struct Curl_multi *multi,
	reset_socket_fdwrite(cpfds->pfds[i].fd);
	}
	if(mask) {
-	if(WSAEventSelect(cpfds->pfds[i].fd, multi->wsa_event, mask) != 0) {
+	if(WSAEventSelect(cpfds->pfds[i].fd, multi->wsa_event, mask)) {
	mresult = CURLM_OUT_OF_MEMORY;
	goto out;
	}

lib/telnet.c+1 -1

@@ -1267,7 +1267,7 @@ static CURLcode telnet_do(struct Curl_easy data, bool done)
	}

	/* Tell Winsock what events we want to listen to */
-	if(WSAEventSelect(sockfd, event_handle, FD_READ \| FD_CLOSE) != 0) {
+	if(WSAEventSelect(sockfd, event_handle, FD_READ \| FD_CLOSE)) {
	WSACloseEvent(event_handle);
	return CURLE_RECV_ERROR;
	}

src/tool_cfgable.c+2 -1

@@ -327,7 +327,8 @@ CURLcode globalconf_init(void)
	if(global->first) {
	/* Perform the libcurl initialization */
	#ifdef CURL_DEBUG_GLOBAL_MEM
-	result = curl_global_init_mem(CURL_GLOBAL_ALL, custom_malloc, custom_free,
+	result = curl_global_init_mem(CURL_GLOBAL_DEFAULT,
+	custom_malloc, custom_free,
	custom_realloc, custom_strdup,
	custom_calloc);
	#else

tests/libtest/lib1507.c+1 -1

@@ -43,7 +43,7 @@ static CURLcode test_lib1507(const char *URL)
	struct curltime mp_start;
	struct curl_slist *rcpt_list = NULL;

-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl_global_init(CURL_GLOBAL_ALL);

	easy_init(curl);

tests/libtest/lib1678.c+1 -1

@@ -110,7 +110,7 @@ static CURLcode test_lib1678(const char *URL)
	if(!packet)
	goto test_cleanup;

-	result = curl_global_init(CURL_GLOBAL_DEFAULT);
+	result = curl_global_init(CURL_GLOBAL_ALL);
	if(result != CURLE_OK)
	goto test_cleanup;

tests/libtest/lib1907.c+1 -1

@@ -30,7 +30,7 @@ static CURLcode test_lib1907(const char *URL)
	CURLcode result = CURLE_OK;
	char error_buffer[CURL_ERROR_SIZE] = "";

-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl_global_init(CURL_GLOBAL_ALL);
	curl = curl_easy_init();
	curl_easy_setopt(curl, CURLOPT_URL, URL);
	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer);

tests/libtest/lib1939.c+1 -1

@@ -29,7 +29,7 @@ static CURLcode test_lib1939(const char *URL)
	CURL *curl;
	int running_handles;

-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl_global_init(CURL_GLOBAL_ALL);

	multi = curl_multi_init();
	if(multi) {

tests/libtest/lib1940.c+1 -1

@@ -120,7 +120,7 @@ static CURLcode test_lib1940(const char *URL)
	header_request = -1;
	}

-	global_init(CURL_GLOBAL_DEFAULT);
+	global_init(CURL_GLOBAL_ALL);
	easy_init(curl);
	easy_setopt(curl, CURLOPT_URL, URL);
	easy_setopt(curl, CURLOPT_VERBOSE, 1L);

tests/libtest/lib1945.c+1 -1

@@ -41,7 +41,7 @@ static CURLcode test_lib1945(const char *URL)
	CURL *curl;
	CURLcode result = CURLE_OK;

-	global_init(CURL_GLOBAL_DEFAULT);
+	global_init(CURL_GLOBAL_ALL);

	easy_init(curl);
	curl_easy_setopt(curl, CURLOPT_URL, URL);

tests/libtest/lib1947.c+1 -1

@@ -31,7 +31,7 @@ static CURLcode test_lib1947(const char *URL)
	int count = 0;
	unsigned int origins;

-	global_init(CURL_GLOBAL_DEFAULT);
+	global_init(CURL_GLOBAL_ALL);

	easy_init(curl);

tests/libtest/lib1948.c+1 -1

@@ -46,7 +46,7 @@ static CURLcode test_lib1948(const char *URL)
	static const char testput[] = "This is test PUT data\n";
	struct put_buffer pbuf;

-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl_global_init(CURL_GLOBAL_ALL);

	easy_init(curl);

tests/libtest/lib1985.c+1 -1

@@ -33,7 +33,7 @@ static CURLcode test_lib1985(const char *URL)
	struct curl_slist *slist = NULL;
	struct curl_slist *slist2 = NULL;
	CURLcode r1 = CURLE_OK, r2 = CURLE_OK;
-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl_global_init(CURL_GLOBAL_ALL);

	curl_msnprintf(host1, sizeof(host1), "firsthost:%s:%s",
	libtest_arg3, libtest_arg4);

tests/libtest/lib590.c+1 -1

@@ -70,7 +70,7 @@ static CURLcode test_lib590(const char *URL)
	goto test_cleanup;

	result = curl_easy_getinfo(curl, CURLINFO_PROXYAUTH_USED, &usedauth);
-	if(CURLAUTH_NTLM != usedauth) {
+	if(usedauth != CURLAUTH_NTLM) {
	curl_mprintf("CURLINFO_PROXYAUTH_USED did not say NTLM\n");
	}

tests/libtest/lib677.c+1 -1

@@ -36,7 +36,7 @@ static CURLcode test_lib677(const char *URL)
	ssize_t pos = 0;
	CURLcode result = CURLE_OK;

-	global_init(CURL_GLOBAL_DEFAULT);
+	global_init(CURL_GLOBAL_ALL);
	multi_init(mcurl);
	easy_init(curl);

tests/libtest/lib678.c+1 -1

@@ -93,7 +93,7 @@ static CURLcode test_cert_blob(const char url, const char cafile)
	static CURLcode test_lib678(const char *URL)
	{
	CURLcode result = CURLE_OK;
-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl_global_init(CURL_GLOBAL_ALL);
	if(!strcmp("check", URL)) {
	CURLcode w = CURLE_OK;
	struct curl_blob blob = { CURL_UNCONST("silly"), 5, 0 };

tests/libtest/lib694.c+1 -1

@@ -58,7 +58,7 @@ static CURLcode test_lib694(const char *URL)
	result = curl_easy_getinfo(curl, CURLINFO_HTTPAUTH_USED, &usedauth);
	if(result)
	goto test_cleanup;
-	if(CURLAUTH_NTLM != usedauth) {
+	if(usedauth != CURLAUTH_NTLM) {
	curl_mprintf("CURLINFO_HTTPAUTH_USED did not say NTLM\n");
	}

tests/libtest/lib751.c+1 -1

@@ -38,7 +38,7 @@ static CURLcode test_lib751(const char *URL)
	(void)URL;
	memset(curls, 0, sizeof(curls));

-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl_global_init(CURL_GLOBAL_ALL);
	multi = curl_multi_init();
	if(!multi) {
	result = CURLE_OUT_OF_MEMORY;

tests/libtest/lib753.c+1 -1

@@ -109,7 +109,7 @@ static CURLcode test_lib753(const char *URL)
	debug_config.nohex = TRUE;
	debug_config.tracetime = TRUE;

-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl_global_init(CURL_GLOBAL_ALL);

	curl_mfprintf(stderr, "init multi\n");
	multi = curl_multi_init();

tests/perf/urlparser.c+1 -1

@@ -28,7 +28,7 @@
	#pragma GCC diagnostic ignored "-Woverlength-strings"
	#endif

-	static const char *urls[] = {
+	static const char * const urls[] = {
	"https://apps.fruit.zom:5555/us/app/reality-become-an-anime-a"
	"vatar/id1404176564",
	"https://bugzilla.mozilla.ork/first/../home",

tests/server/sockfilt.c+1 -2

@@ -706,8 +706,7 @@ static int select_ws(int nfds, fd_set readfds, fd_set writefds,
	if(wsaevents.lNetworkEvents & FD_WRITE) {
	swrite(wsasock, NULL, 0); /* reset FD_WRITE */
	}
-	if(WSAEventSelect(wsasock, wsaevent, wsaevents.lNetworkEvents)
-	== 0) {
+	if(!WSAEventSelect(wsasock, wsaevent, wsaevents.lNetworkEvents)) {
	handles[nfd] = (HANDLE)wsaevent;
	data[nws].wsasock = wsasock;
	data[nws].wsaevent = wsaevent;