From 8a8ff47b63aff1d72c1796dbdb4955f243beac23 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 3 Aug 2026 02:28:33 +0200 Subject: [PATCH] tidy-up: C and CI - 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 --- .github/workflows/linux.yml | 2 +- CMakeLists.txt | 2 +- configure.ac | 2 +- docs/examples/anyauthput.c | 2 +- docs/examples/ftp-wildcard.c | 2 +- docs/examples/htmltidy.c | 2 +- docs/examples/http2-download.c | 2 +- docs/examples/http2-upload.c | 16 +++++++--------- docs/examples/httpput-postfields.c | 2 +- docs/examples/httpput.c | 2 +- docs/examples/multi-event.c | 2 +- docs/examples/multi-uv.c | 2 +- docs/examples/smooth-gtk-thread.c | 2 +- docs/examples/sslbackend.c | 2 +- docs/internals/CODE_STYLE.md | 2 +- docs/libcurl/curl_strequal.md | 2 +- docs/libcurl/curl_strnequal.md | 2 +- docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.md | 2 +- docs/libcurl/opts/CURLOPT_PROTOCOLS.md | 2 +- docs/libcurl/opts/CURLOPT_PROTOCOLS_STR.md | 2 +- docs/libcurl/opts/CURLOPT_READFUNCTION.md | 2 +- docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS.md | 2 +- docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS_STR.md | 2 +- lib/socks_sspi.c | 3 +-- lib/vauth/digest_sspi.c | 10 +++++----- lib/vauth/krb5_sspi.c | 6 +++--- lib/vauth/ntlm_sspi.c | 6 +++--- lib/vauth/spnego_sspi.c | 12 +++++------- lib/vtls/schannel.c | 6 ++---- projects/OS400/curlmain.c | 4 ++-- projects/vms/report_openssl_version.c | 2 +- src/curlinfo.c | 2 +- tests/cmake/test.c | 2 +- tests/cmake/test.cpp | 2 +- tests/libtest/first.c | 2 +- tests/server/first.c | 2 +- tests/server/util.c | 8 +++----- 37 files changed, 59 insertions(+), 68 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8a05b7105e..ae0c6924c5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ca969539a..cdf47d486b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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] = ' '; diff --git a/configure.ac b/configure.ac index 0c085a85e8..5071f86523 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c index b1bd9f0fbf..a28ee2c694 100644 --- a/docs/examples/anyauthput.c +++ b/docs/examples/anyauthput.c @@ -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; diff --git a/docs/examples/ftp-wildcard.c b/docs/examples/ftp-wildcard.c index abde048e9d..d7627aab98 100644 --- a/docs/examples/ftp-wildcard.c +++ b/docs/examples/ftp-wildcard.c @@ -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; diff --git a/docs/examples/htmltidy.c b/docs/examples/htmltidy.c index 2e2def59c3..8a510f49f4 100644 --- a/docs/examples/htmltidy.c +++ b/docs/examples/htmltidy.c @@ -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]; diff --git a/docs/examples/http2-download.c b/docs/examples/http2-download.c index 3d612781bb..d46c4caead 100644 --- a/docs/examples/http2-download.c +++ b/docs/examples/http2-download.c @@ -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; diff --git a/docs/examples/http2-upload.c b/docs/examples/http2-upload.c index cad74afc50..9acd7198f1 100644 --- a/docs/examples/http2-upload.c +++ b/docs/examples/http2-upload.c @@ -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; diff --git a/docs/examples/httpput-postfields.c b/docs/examples/httpput-postfields.c index 602190d9f6..d34f387fdb 100644 --- a/docs/examples/httpput-postfields.c +++ b/docs/examples/httpput-postfields.c @@ -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; diff --git a/docs/examples/httpput.c b/docs/examples/httpput.c index fb33c8ac40..90cb81b7de 100644 --- a/docs/examples/httpput.c +++ b/docs/examples/httpput.c @@ -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; diff --git a/docs/examples/multi-event.c b/docs/examples/multi-event.c index b52adefa0c..d10c93d3e0 100644 --- a/docs/examples/multi-event.c +++ b/docs/examples/multi-event.c @@ -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; diff --git a/docs/examples/multi-uv.c b/docs/examples/multi-uv.c index 2671556ba0..4915586493 100644 --- a/docs/examples/multi-uv.c +++ b/docs/examples/multi-uv.c @@ -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 }; diff --git a/docs/examples/smooth-gtk-thread.c b/docs/examples/smooth-gtk-thread.c index 82ce1a2256..cca3be738b 100644 --- a/docs/examples/smooth-gtk-thread.c +++ b/docs/examples/smooth-gtk-thread.c @@ -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; diff --git a/docs/examples/sslbackend.c b/docs/examples/sslbackend.c index 39c042a677..bbb1ea4094 100644 --- a/docs/examples/sslbackend.c +++ b/docs/examples/sslbackend.c @@ -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; diff --git a/docs/internals/CODE_STYLE.md b/docs/internals/CODE_STYLE.md index af8d916b36..bbf23f944b 100644 --- a/docs/internals/CODE_STYLE.md +++ b/docs/internals/CODE_STYLE.md @@ -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; } diff --git a/docs/libcurl/curl_strequal.md b/docs/libcurl/curl_strequal.md index e7270d874e..0d9689acf7 100644 --- a/docs/libcurl/curl_strequal.md +++ b/docs/libcurl/curl_strequal.md @@ -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])) diff --git a/docs/libcurl/curl_strnequal.md b/docs/libcurl/curl_strnequal.md index db42bcdf8e..7e0d40461d 100644 --- a/docs/libcurl/curl_strnequal.md +++ b/docs/libcurl/curl_strnequal.md @@ -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)) diff --git a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.md b/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.md index c79b5e7ebd..aea8ec45e5 100644 --- a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.md +++ b/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.md @@ -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(); diff --git a/docs/libcurl/opts/CURLOPT_PROTOCOLS.md b/docs/libcurl/opts/CURLOPT_PROTOCOLS.md index cdd02b5ed8..0237733159 100644 --- a/docs/libcurl/opts/CURLOPT_PROTOCOLS.md +++ b/docs/libcurl/opts/CURLOPT_PROTOCOLS.md @@ -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) { diff --git a/docs/libcurl/opts/CURLOPT_PROTOCOLS_STR.md b/docs/libcurl/opts/CURLOPT_PROTOCOLS_STR.md index 02a78ae5d6..969bf88ab7 100644 --- a/docs/libcurl/opts/CURLOPT_PROTOCOLS_STR.md +++ b/docs/libcurl/opts/CURLOPT_PROTOCOLS_STR.md @@ -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) { diff --git a/docs/libcurl/opts/CURLOPT_READFUNCTION.md b/docs/libcurl/opts/CURLOPT_READFUNCTION.md index 0046ded635..0c8304ce3c 100644 --- a/docs/libcurl/opts/CURLOPT_READFUNCTION.md +++ b/docs/libcurl/opts/CURLOPT_READFUNCTION.md @@ -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; diff --git a/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS.md b/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS.md index 1d860312c0..0803d58786 100644 --- a/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS.md +++ b/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS.md @@ -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) { diff --git a/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS_STR.md b/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS_STR.md index 8f3c0ef885..731b506319 100644 --- a/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS_STR.md +++ b/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS_STR.md @@ -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) { diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c index 4474180e7b..576d6aef5b 100644 --- a/lib/socks_sspi.c +++ b/lib/socks_sspi.c @@ -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); diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index c9b1432830..e3648e37b8 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -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); diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index 543a6fe284..24d2421be6 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -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); diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c index 2e98e86e5f..4f977865c9 100644 --- a/lib/vauth/ntlm_sspi.c +++ b/lib/vauth/ntlm_sspi.c @@ -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); diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c index 3f6c93f0bf..3a140ad84e 100644 --- a/lib/vauth/spnego_sspi.c +++ b/lib/vauth/spnego_sspi.c @@ -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); diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index aca109bfdc..eea5f3af55 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -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); diff --git a/projects/OS400/curlmain.c b/projects/OS400/curlmain.c index 690e8c6221..fa2e93d35f 100644 --- a/projects/OS400/curlmain.c +++ b/projects/OS400/curlmain.c @@ -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; diff --git a/projects/vms/report_openssl_version.c b/projects/vms/report_openssl_version.c index d2b0d367bc..9a8538e17d 100644 --- a/projects/vms/report_openssl_version.c +++ b/projects/vms/report_openssl_version.c @@ -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); diff --git a/src/curlinfo.c b/src/curlinfo.c index 5357a36fa8..1760a95d95 100644 --- a/src/curlinfo.c +++ b/src/curlinfo.c @@ -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; diff --git a/tests/cmake/test.c b/tests/cmake/test.c index 75c6bf913e..dc27c6ce0d 100644 --- a/tests/cmake/test.c +++ b/tests/cmake/test.c @@ -24,7 +24,7 @@ #include #include -int main(int argc, const char **argv) +int main(int argc, const char *argv[]) { (void)argc; puts("libcurl C test:"); diff --git a/tests/cmake/test.cpp b/tests/cmake/test.cpp index f5fd4ecc2a..18a76d8561 100644 --- a/tests/cmake/test.cpp +++ b/tests/cmake/test.cpp @@ -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; diff --git a/tests/libtest/first.c b/tests/libtest/first.c index a512cddae9..2968ee611a 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -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; diff --git a/tests/server/first.c b/tests/server/first.c index c19018bc0e..fa233914b7 100644 --- a/tests/server/first.c +++ b/tests/server/first.c @@ -25,7 +25,7 @@ #include -int main(int argc, const char **argv) +int main(int argc, const char *argv[]) { entry_func_t entry_func; const char *entry_name; diff --git a/tests/server/util.c b/tests/server/util.c index c4ea559855..54854285ec 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -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",