mmo-ref/dep-curl
1
0
Fork 0
mirror of https://github.com/curl/curl synced 2026-08-25 12:32:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tidy-up: C and CI

Browse source 
- drop redundant casts for `CURL_UNCONST()` pointers (Windows).
- GHA/linux: delete redundant/dupe `-g` C flag in memory sanitizer job.
  Spotted-by: Daniel Stenberg
- examples/http2-upload: drop local macro.
- examples/http2-upload: drop leading underscore from union name.
- examples/http2-upload: drop interim macro.
- tests/server/util: reapply patch lost in a rebase.
- sync `main()` declarations across the codebase.

Closes #22559
This commit is contained in:
Viktor Szakats 2026-08-03 02:28:33 +02:00
parent 35843dd635
commit 8a8ff47b63
No known key found for this signature in database
37 changed files with 59 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/linux.yml vendored
View file

@ -423,7 +423,7 @@ jobs:
install_packages: clang-22
install_steps: randcurl
CC: clang-22
CFLAGS: -fsanitize=memory -Wformat -Werror=format-security -Werror=array-bounds -g
CFLAGS: -fsanitize=memory -Wformat -Werror=format-security -Werror=array-bounds
LDFLAGS: -fsanitize=memory
LIBS: -ldl
configure: --without-ssl --without-zlib --without-brotli --without-zstd --without-libpsl --without-nghttp2 --enable-debug

2
CMakeLists.txt
View file

@ -1806,7 +1806,7 @@ if(NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
# On non-Windows and not cross-compiling, check for writable argv[]
include(CheckCSourceRuns)
check_c_source_runs("
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
(void)argc;
argv[0][0] = ' ';

2
configure.ac
View file

@ -1841,7 +1841,7 @@ dnl **********************************************************************
AC_MSG_CHECKING([if argv can be written to])
CURL_RUN_IFELSE([[
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
#ifdef _WIN32
/* on Windows, writing to the argv does not hide the argument in

2
docs/examples/anyauthput.c
View file

@ -88,7 +88,7 @@ static size_t read_cb(char *ptr, size_t size, size_t nmemb, void *stream)
return nread;
}
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
CURL *curl;
CURLcode result;

2
docs/examples/ftp-wildcard.c
View file

@ -97,7 +97,7 @@ static size_t write_cb(char *buff, size_t size, size_t nmemb, void *cb_data)
return written;
}
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
/* curl easy handle */
CURL *curl;

2
docs/examples/htmltidy.c
View file

@ -74,7 +74,7 @@ static void dumpNode(TidyDoc doc, TidyNode tnod, int indent)
}
}
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
CURL *curl;
char curl_errbuf[CURL_ERROR_SIZE];

2
docs/examples/http2-download.c
View file

@ -187,7 +187,7 @@ static int setup(struct transfer *t, int num)
/*
* Download many transfers over HTTP/2, using the same connection!
*/
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
CURLcode result;
struct transfer *trans;

16
docs/examples/http2-upload.c
View file

@ -67,20 +67,18 @@
#endif
#ifdef _MSC_VER
#define gettimeofday(a, b) my_gettimeofday(a, b)
static int my_gettimeofday(struct timeval *tp, void *tzp)
static int gettimeofday(struct timeval *tp, void *tzp)
{
(void)tzp;
if(tp) {
/* Offset between 1601-01-01 and 1970-01-01 in 100 nanosec units */
#define WIN32_FT_OFFSET 116444736000000000
union {
CURL_TYPEOF_CURL_OFF_T ns100; /* time since 1 Jan 1601 in 100ns units */
FILETIME ft;
} _now;
GetSystemTimeAsFileTime(&_now.ft);
tp->tv_usec = (long)((_now.ns100 / 10) % 1000000);
tp->tv_sec = (long)((_now.ns100 - WIN32_FT_OFFSET) / 10000000);
} now;
GetSystemTimeAsFileTime(&now.ft);
tp->tv_usec = (long)((now.ns100 / 10) % 1000000);
/* subtract offset between 1601-01-01 and 1970-01-01 in 100ns units */
tp->tv_sec = (long)((now.ns100 - 116444736000000000) / 10000000);
}
return 0;
}
@ -286,7 +284,7 @@ static int setup(struct input *t, int num, const char *upload)
/*
* Upload all files over HTTP/2, using the same physical connection!
*/
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
CURLcode result;
struct input *trans;

2
docs/examples/httpput-postfields.c
View file

@ -47,7 +47,7 @@ static const char olivertwist[] =
* CURLOPT_POSTFIELDS to the URL given as an argument.
*/
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
CURL *curl;
CURLcode result;

2
docs/examples/httpput.c
View file

@ -73,7 +73,7 @@ static size_t read_cb(char *ptr, size_t size, size_t nmemb, void *stream)
return retcode;
}
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
CURL *curl;
CURLcode result;

2
docs/examples/multi-event.c
View file

@ -211,7 +211,7 @@ static int handle_socket(CURL *curl, curl_socket_t s, int action, void *userp,
return 0;
}
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
CURLcode result;

2
docs/examples/multi-uv.c
View file

@ -225,7 +225,7 @@ static int cb_socket(CURL *curl, curl_socket_t s, int action,
return 0;
}
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
CURLcode result;
struct datauv uv = { 0 };

2
docs/examples/smooth-gtk-thread.c
View file

@ -165,7 +165,7 @@ static gboolean cb_delete(GtkWidget *window, gpointer data)
return FALSE;
}
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
GtkWidget *top_window, *outside_frame, *inside_frame, *progress_bar;

2
docs/examples/sslbackend.c
View file

@ -40,7 +40,7 @@
* **** This example only works with libcurl 7.56.0 and later! ****
*/
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
const char *name = argc > 1 ? argv[1] : "openssl";
CURLsslset result;

2
docs/internals/CODE_STYLE.md
View file

@ -104,7 +104,7 @@ if(!x)
For functions the opening brace should be on a separate line:
```c
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
return 1;
}

2
docs/libcurl/curl_strequal.md
View file

@ -44,7 +44,7 @@ string comparison functions. This function works on all platforms.
# EXAMPLE
~~~c
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
const char *name = "compare";
if(curl_strequal(name, argv[1]))

2
docs/libcurl/curl_strnequal.md
View file

@ -47,7 +47,7 @@ string comparison functions. This function works on all platforms.
# EXAMPLE
~~~c
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
const char *name = "compare";
if(curl_strnequal(name, argv[1], 5))

2
docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.md
View file

@ -140,7 +140,7 @@ static size_t wf(char *ptr, size_t size, size_t nmemb, void *stream)
return size * nmemb;
}
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
CURLcode result;
curl = curl_easy_init();

2
docs/libcurl/opts/CURLOPT_PROTOCOLS.md
View file

@ -82,7 +82,7 @@ All protocols built-in.
# EXAMPLE
~~~c
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
CURL *curl = curl_easy_init();
if(curl) {

2
docs/libcurl/opts/CURLOPT_PROTOCOLS_STR.md
View file

@ -65,7 +65,7 @@ All protocols built-in
# EXAMPLE
~~~c
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
CURL *curl = curl_easy_init();
if(curl) {

2
docs/libcurl/opts/CURLOPT_READFUNCTION.md
View file

@ -100,7 +100,7 @@ size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userdata)
return retcode;
}
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
FILE *file = fopen(argv[1], "rb");
CURLcode result;

2
docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS.md
View file

@ -87,7 +87,7 @@ HTTP, HTTPS, FTP and FTPS
# EXAMPLE
~~~c
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
CURL *curl = curl_easy_init();
if(curl) {

2
docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS_STR.md
View file

@ -71,7 +71,7 @@ HTTP, HTTPS, FTP and FTPS
# EXAMPLE
~~~c
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
CURL *curl = curl_easy_init();
if(curl) {

3
lib/socks_sspi.c
View file

@ -77,8 +77,7 @@ static CURLcode socks5_sspi_setup(struct Curl_cfilter *cf,
return CURLE_OUT_OF_MEMORY;
status =
Curl_pSecFn->AcquireCredentialsHandle(NULL,
(TCHAR *)CURL_UNCONST(TEXT("Kerberos")),
Curl_pSecFn->AcquireCredentialsHandle(NULL, CURL_UNCONST(TEXT("Kerberos")),
SECPKG_CRED_OUTBOUND,
NULL, NULL, NULL, NULL,
cred_handle, NULL);

10
lib/vauth/digest_sspi.c
View file

@ -54,7 +54,7 @@ bool Curl_auth_is_digest_supported(void)
/* Query the security package for Digest */
status =
Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
&SecurityPackage);
/* Release the package buffer as it is not required anymore */
@ -115,7 +115,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data,
/* Query the security package for DigestSSP */
status =
Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
&SecurityPackage);
if(status != SEC_E_OK) {
failf(data, "SSPI: could not get auth info");
@ -158,7 +158,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data,
/* Acquire our credentials handle */
status = Curl_pSecFn->AcquireCredentialsHandle(NULL,
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
SECPKG_CRED_OUTBOUND, NULL,
p_identity, NULL, NULL,
&credentials, NULL);
@ -402,7 +402,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data,
/* Query the security package for DigestSSP */
status =
Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
&SecurityPackage);
if(status != SEC_E_OK) {
failf(data, "SSPI: could not get auth info");
@ -502,7 +502,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data,
/* Acquire our credentials handle */
status = Curl_pSecFn->AcquireCredentialsHandle(NULL,
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
CURL_UNCONST(TEXT(SP_NAME_DIGEST)),
SECPKG_CRED_OUTBOUND, NULL,
p_identity, NULL, NULL,
&credentials, NULL);

6
lib/vauth/krb5_sspi.c
View file

@ -46,7 +46,7 @@ bool Curl_auth_is_gssapi_supported(void)
/* Query the security package for Kerberos */
status = Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_KERBEROS)),
CURL_UNCONST(TEXT(SP_NAME_KERBEROS)),
&SecurityPackage);
/* Release the package buffer as it is not required anymore */
@ -109,7 +109,7 @@ CURLcode Curl_auth_create_gssapi_user_message(struct Curl_easy *data,
if(!krb5->output_token) {
/* Query the security package for Kerberos */
status = Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_KERBEROS)),
CURL_UNCONST(TEXT(SP_NAME_KERBEROS)),
&SecurityPackage);
if(status != SEC_E_OK) {
failf(data, "SSPI: could not get auth info");
@ -150,7 +150,7 @@ CURLcode Curl_auth_create_gssapi_user_message(struct Curl_easy *data,
/* Acquire our credentials handle */
status = Curl_pSecFn->AcquireCredentialsHandle(NULL,
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_KERBEROS)),
CURL_UNCONST(TEXT(SP_NAME_KERBEROS)),
SECPKG_CRED_OUTBOUND, NULL,
krb5->p_identity, NULL, NULL,
krb5->credentials, NULL);

6
lib/vauth/ntlm_sspi.c
View file

@ -46,7 +46,7 @@ bool Curl_auth_is_ntlm_supported(void)
/* Query the security package for NTLM */
status = Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_NTLM)),
CURL_UNCONST(TEXT(SP_NAME_NTLM)),
&SecurityPackage);
/* Release the package buffer as it is not required anymore */
@ -95,7 +95,7 @@ CURLcode Curl_auth_create_ntlm_type1_message(struct Curl_easy *data,
/* Query the security package for NTLM */
status = Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_NTLM)),
CURL_UNCONST(TEXT(SP_NAME_NTLM)),
&SecurityPackage);
if(status != SEC_E_OK) {
failf(data, "SSPI: could not get auth info");
@ -135,7 +135,7 @@ CURLcode Curl_auth_create_ntlm_type1_message(struct Curl_easy *data,
/* Acquire our credentials handle */
status = Curl_pSecFn->AcquireCredentialsHandle(NULL,
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_NTLM)),
CURL_UNCONST(TEXT(SP_NAME_NTLM)),
SECPKG_CRED_OUTBOUND, NULL,
ntlm->p_identity, NULL, NULL,
ntlm->credentials, NULL);

12
lib/vauth/spnego_sspi.c
View file

@ -48,7 +48,7 @@ bool Curl_auth_is_spnego_supported(void)
/* Query the security package for Negotiate */
status = Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_NEGOTIATE)),
CURL_UNCONST(TEXT(SP_NAME_NEGOTIATE)),
&SecurityPackage);
/* Release the package buffer as it is not required anymore */
@ -114,7 +114,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
if(!nego->output_token) {
/* Query the security package for Negotiate */
nego->status = Curl_pSecFn->QuerySecurityPackageInfo(
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_NEGOTIATE)),
CURL_UNCONST(TEXT(SP_NAME_NEGOTIATE)),
&SecurityPackage);
if(nego->status != SEC_E_OK) {
failf(data, "SSPI: could not get auth info");
@ -166,11 +166,9 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
* https://learn.microsoft.com/windows/win32/api/sspi/ns-sspi-sec_winnt_auth_identity_exa
*/
#ifdef UNICODE
nego->identity.PackageList =
(unsigned short *)CURL_UNCONST(TEXT("!ntlm"));
nego->identity.PackageList = CURL_UNCONST(TEXT("!ntlm"));
#else
nego->identity.PackageList =
(unsigned char *)CURL_UNCONST(TEXT("!ntlm"));
nego->identity.PackageList = CURL_UNCONST(TEXT("!ntlm"));
#endif
nego->identity.PackageListLength = 5;
@ -181,7 +179,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
/* Acquire our credentials handle */
nego->status = Curl_pSecFn->AcquireCredentialsHandle(NULL,
(TCHAR *)CURL_UNCONST(TEXT(SP_NAME_NEGOTIATE)),
CURL_UNCONST(TEXT(SP_NAME_NEGOTIATE)),
SECPKG_CRED_OUTBOUND, NULL,
nego->p_identity, NULL, NULL,
nego->credentials, NULL);

6
lib/vtls/schannel.c
View file

@ -627,8 +627,7 @@ static CURLcode acquire_sspi_handle(struct Curl_cfilter *cf,
}
sspi_status =
Curl_pSecFn->AcquireCredentialsHandle(NULL,
(TCHAR *)CURL_UNCONST(UNISP_NAME),
Curl_pSecFn->AcquireCredentialsHandle(NULL, CURL_UNCONST(UNISP_NAME),
SECPKG_CRED_OUTBOUND, NULL,
&credentials, NULL, NULL,
&backend->cred->cred_handle, NULL);
@ -677,8 +676,7 @@ static CURLcode acquire_sspi_handle(struct Curl_cfilter *cf,
}
sspi_status =
Curl_pSecFn->AcquireCredentialsHandle(NULL,
(TCHAR *)CURL_UNCONST(UNISP_NAME),
Curl_pSecFn->AcquireCredentialsHandle(NULL, CURL_UNCONST(UNISP_NAME),
SECPKG_CRED_OUTBOUND, NULL,
&schannel_cred, NULL, NULL,
&backend->cred->cred_handle, NULL);

4
projects/OS400/curlmain.c
View file

@ -42,13 +42,13 @@ extern int QadrtFreeEnviron(void);
extern char * setlocale_a(int, const char *);
/* The ASCII main program. */
extern int main_a(int argc, char **argv);
extern int main_a(int argc, char *argv[]);
/* Global values of original EBCDIC arguments. */
int ebcdic_argc;
char ** ebcdic_argv;
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
int i;
int j;

2
projects/vms/report_openssl_version.c
View file

@ -39,7 +39,7 @@ unsigned long LIB$SET_SYMBOL(const struct dsc$descriptor_s *symbol,
const struct dsc$descriptor_s *value,
const unsigned long *table_type);
int main(int argc, char **argv)
int main(int argc, char *argv[])
{
void *libptr;
const char *(*ssl_version)(int t);

2
src/curlinfo.c
View file

@ -270,7 +270,7 @@ static const char * const disabled[] = {
#endif
};
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
size_t i;

2
tests/cmake/test.c
View file

@ -24,7 +24,7 @@
#include <curl/curl.h>
#include <stdio.h>
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
(void)argc;
puts("libcurl C test:");

2
tests/cmake/test.cpp
View file

@ -34,7 +34,7 @@ public:
}
};
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
(void)argc;
std::cout << "libcurl C++ test:" << std::endl;

2
tests/libtest/first.c
View file

@ -211,7 +211,7 @@ void ws_close(CURL *curl)
}
#endif /* CURL_DISABLE_WEBSOCKETS */
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
const char *URL = "";
CURLcode result;

2
tests/server/first.c
View file

@ -25,7 +25,7 @@
#include <stdio.h>
int main(int argc, const char **argv)
int main(int argc, const char *argv[])
{
entry_func_t entry_func;
const char *entry_name;

8
tests/server/util.c
View file

@ -1097,13 +1097,11 @@ int open_stream_sock(curl_socket_t *psock, uint16_t *pport)
srvr_sockaddr_union_t localaddr;
memset(&localaddr, 0, sizeof(localaddr));
#ifdef USE_IPV6
if(socket_domain != AF_INET6)
if(socket_domain == AF_INET6)
la_size = sizeof(localaddr.sa6);
else
#endif
la_size = sizeof(localaddr.sa4);
#ifdef USE_IPV6
else
la_size = sizeof(localaddr.sa6);
#endif
if(getsockname(sock, &localaddr.sa, &la_size) < 0) {
sockerr = SOCKERRNO;
logmsg("getsockname() failed with error (%d) %s",