Mirrors/curl
0
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-01-18 17:21:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

tidy-up: miscellaneous

Browse Source 
- schannel: delete superfluous parenthesis.
- tftp: delete stray space from log output.
- ws: update guard comment.
- docs/examples: constify variables.
- runtests/servers: enclose unknown parameter between quotes.
- scripts/perlcheck.sh: drop redundant grep `-E` option.
- THANKS: move names from comments to THANKS.
- sync `--depth` option style across scripts.
- sync git repo URL ending between some scripts.
- BINDINGS.md: drop protocol from archive.org URL path.
- whitespace, indent, unfold lines.

Closes #19565
This commit is contained in:
Viktor Szakats
2025-10-25 23:32:14 +02:00
parent a87383828e
commit 1b48c6148a
32 changed files with 62 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/http3-linux.yml vendored
View File

@@ -189,7 +189,7 @@ jobs:
if: ${{ steps.cache-openssl-http3-no-deprecated.outputs.cache-hit != 'true' }} if: ${{ steps.cache-openssl-http3-no-deprecated.outputs.cache-hit != 'true' }}
run: | run: |
cd ~ cd ~
git clone --quiet --depth=1 -b "openssl-${OPENSSL_VERSION}" https://github.com/openssl/openssl git clone --quiet --depth 1 -b "openssl-${OPENSSL_VERSION}" https://github.com/openssl/openssl
cd openssl cd openssl
./config --prefix="$PWD"/build --libdir=lib no-makedepend no-apps no-docs no-tests no-deprecated ./config --prefix="$PWD"/build --libdir=lib no-makedepend no-apps no-docs no-tests no-deprecated
make make
@@ -232,7 +232,7 @@ jobs:
if: ${{ steps.cache-gnutls.outputs.cache-hit != 'true' }} if: ${{ steps.cache-gnutls.outputs.cache-hit != 'true' }}
run: | run: |
cd ~ cd ~
git clone --quiet --depth=1 -b "${GNUTLS_VERSION}" https://github.com/gnutls/gnutls.git git clone --quiet --depth 1 -b "${GNUTLS_VERSION}" https://github.com/gnutls/gnutls
cd gnutls cd gnutls
# required: nettle-dev libp11-kit-dev libev-dev autopoint bison gperf gtk-doc-tools libtasn1-bin # required: nettle-dev libp11-kit-dev libev-dev autopoint bison gperf gtk-doc-tools libtasn1-bin
./bootstrap ./bootstrap
@@ -247,7 +247,7 @@ jobs:
if: ${{ steps.cache-wolfssl.outputs.cache-hit != 'true' }} if: ${{ steps.cache-wolfssl.outputs.cache-hit != 'true' }}
run: | run: |
cd ~ cd ~
git clone --quiet --depth=1 -b "v${WOLFSSL_VERSION}-stable" https://github.com/wolfSSL/wolfssl.git git clone --quiet --depth 1 -b "v${WOLFSSL_VERSION}-stable" https://github.com/wolfSSL/wolfssl
cd wolfssl cd wolfssl
./autogen.sh ./autogen.sh
./configure --disable-dependency-tracking --enable-all --enable-quic \ ./configure --disable-dependency-tracking --enable-all --enable-quic \
@@ -259,9 +259,9 @@ jobs:
if: ${{ steps.cache-nghttp3.outputs.cache-hit != 'true' }} if: ${{ steps.cache-nghttp3.outputs.cache-hit != 'true' }}
run: | run: |
cd ~ cd ~
git clone --quiet --depth=1 -b "v${NGHTTP3_VERSION}" https://github.com/ngtcp2/nghttp3 git clone --quiet --depth 1 -b "v${NGHTTP3_VERSION}" https://github.com/ngtcp2/nghttp3
cd nghttp3 cd nghttp3
git submodule update --init --depth=1 git submodule update --init --depth 1
autoreconf -fi autoreconf -fi
./configure --disable-dependency-tracking --prefix="$PWD"/build --enable-lib-only ./configure --disable-dependency-tracking --prefix="$PWD"/build --enable-lib-only
make make
@@ -272,7 +272,7 @@ jobs:
# building twice to get crypto libs for ossl, libressl and awslc installed # building twice to get crypto libs for ossl, libressl and awslc installed
run: | run: |
cd ~ cd ~
git clone --quiet --depth=1 -b "v${NGTCP2_VERSION}" https://github.com/ngtcp2/ngtcp2 git clone --quiet --depth 1 -b "v${NGTCP2_VERSION}" https://github.com/ngtcp2/ngtcp2
cd ngtcp2 cd ngtcp2
autoreconf -fi autoreconf -fi
./configure --disable-dependency-tracking --prefix="$PWD"/build \ ./configure --disable-dependency-tracking --prefix="$PWD"/build \
@@ -290,7 +290,7 @@ jobs:
if: ${{ steps.cache-ngtcp2-boringssl.outputs.cache-hit != 'true' }} if: ${{ steps.cache-ngtcp2-boringssl.outputs.cache-hit != 'true' }}
run: | run: |
cd ~ cd ~
git clone --quiet --depth=1 -b "v${NGTCP2_VERSION}" https://github.com/ngtcp2/ngtcp2 ngtcp2-boringssl git clone --quiet --depth 1 -b "v${NGTCP2_VERSION}" https://github.com/ngtcp2/ngtcp2 ngtcp2-boringssl
cd ngtcp2-boringssl cd ngtcp2-boringssl
autoreconf -fi autoreconf -fi
./configure --disable-dependency-tracking --prefix="$PWD"/build \ ./configure --disable-dependency-tracking --prefix="$PWD"/build \
@@ -303,9 +303,9 @@ jobs:
if: ${{ steps.cache-nghttp2.outputs.cache-hit != 'true' }} if: ${{ steps.cache-nghttp2.outputs.cache-hit != 'true' }}
run: | run: |
cd ~ cd ~
git clone --quiet --depth=1 -b "v${NGHTTP2_VERSION}" https://github.com/nghttp2/nghttp2 git clone --quiet --depth 1 -b "v${NGHTTP2_VERSION}" https://github.com/nghttp2/nghttp2
cd nghttp2 cd nghttp2
git submodule update --init --depth=1 git submodule update --init --depth 1
autoreconf -fi autoreconf -fi
# required (for nghttpx application): libc-ares-dev libev-dev zlib1g-dev # required (for nghttpx application): libc-ares-dev libev-dev zlib1g-dev
# optional (for nghttpx application): libbrotli-dev # optional (for nghttpx application): libbrotli-dev
@@ -578,7 +578,7 @@ jobs:
if: ${{ matrix.build.name == 'quiche' && steps.cache-quiche.outputs.cache-hit != 'true' }} if: ${{ matrix.build.name == 'quiche' && steps.cache-quiche.outputs.cache-hit != 'true' }}
run: | run: |
cd ~ cd ~
git clone --quiet --depth=1 -b "${QUICHE_VERSION}" --recursive https://github.com/cloudflare/quiche.git git clone --quiet --depth 1 -b "${QUICHE_VERSION}" --recursive https://github.com/cloudflare/quiche
cd quiche cd quiche
#### Work-around https://github.com/curl/curl/issues/7927 ####### #### Work-around https://github.com/curl/curl/issues/7927 #######
#### See https://github.com/alexcrichton/cmake-rs/issues/131 #### #### See https://github.com/alexcrichton/cmake-rs/issues/131 ####

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

@@ -580,7 +580,7 @@ jobs:
- name: 'build openssl (thread sanitizer)' - name: 'build openssl (thread sanitizer)'
if: ${{ contains(matrix.build.install_steps, 'openssl-tsan') && steps.cache-openssl-tsan.outputs.cache-hit != 'true' }} if: ${{ contains(matrix.build.install_steps, 'openssl-tsan') && steps.cache-openssl-tsan.outputs.cache-hit != 'true' }}
run: | run: |
git clone --quiet --depth=1 -b "openssl-${OPENSSL_VERSION}" https://github.com/openssl/openssl git clone --quiet --depth 1 -b "openssl-${OPENSSL_VERSION}" https://github.com/openssl/openssl
cd openssl cd openssl
CC=clang CFLAGS='-fsanitize=thread' LDFLAGS='-fsanitize=thread' ./config --prefix=/home/runner/openssl --libdir=lib no-makedepend no-apps no-docs no-tests CC=clang CFLAGS='-fsanitize=thread' LDFLAGS='-fsanitize=thread' ./config --prefix=/home/runner/openssl --libdir=lib no-makedepend no-apps no-docs no-tests
make make

13
CMakeLists.txt
View File

@@ -21,7 +21,6 @@
# SPDX-License-Identifier: curl # SPDX-License-Identifier: curl
# #
########################################################################### ###########################################################################
# by Tetetest and Sukender (Benoit Neil)
cmake_minimum_required(VERSION 3.7...3.16 FATAL_ERROR) cmake_minimum_required(VERSION 3.7...3.16 FATAL_ERROR)
message(STATUS "Using CMake version ${CMAKE_VERSION}") message(STATUS "Using CMake version ${CMAKE_VERSION}")
@@ -1741,9 +1740,9 @@ check_function_exists("eventfd" HAVE_EVENTFD)
check_symbol_exists("ftruncate" "unistd.h" HAVE_FTRUNCATE) check_symbol_exists("ftruncate" "unistd.h" HAVE_FTRUNCATE)
check_symbol_exists("getpeername" "${CURL_INCLUDES}" HAVE_GETPEERNAME) # winsock2.h unistd.h proto/bsdsocket.h check_symbol_exists("getpeername" "${CURL_INCLUDES}" HAVE_GETPEERNAME) # winsock2.h unistd.h proto/bsdsocket.h
check_symbol_exists("getsockname" "${CURL_INCLUDES}" HAVE_GETSOCKNAME) # winsock2.h unistd.h proto/bsdsocket.h check_symbol_exists("getsockname" "${CURL_INCLUDES}" HAVE_GETSOCKNAME) # winsock2.h unistd.h proto/bsdsocket.h
check_function_exists("getrlimit" HAVE_GETRLIMIT) check_function_exists("getrlimit" HAVE_GETRLIMIT)
check_function_exists("setlocale" HAVE_SETLOCALE) check_function_exists("setlocale" HAVE_SETLOCALE)
check_function_exists("setrlimit" HAVE_SETRLIMIT) check_function_exists("setrlimit" HAVE_SETRLIMIT)
if(WIN32) if(WIN32)
# include wincrypt.h as a workaround for mingw-w64 __MINGW64_VERSION_MAJOR <= 5 header bug */ # include wincrypt.h as a workaround for mingw-w64 __MINGW64_VERSION_MAJOR <= 5 header bug */
@@ -1752,9 +1751,9 @@ else()
check_function_exists("if_nametoindex" HAVE_IF_NAMETOINDEX) # net/if.h check_function_exists("if_nametoindex" HAVE_IF_NAMETOINDEX) # net/if.h
check_function_exists("realpath" HAVE_REALPATH) check_function_exists("realpath" HAVE_REALPATH)
check_function_exists("sched_yield" HAVE_SCHED_YIELD) check_function_exists("sched_yield" HAVE_SCHED_YIELD)
check_symbol_exists("strcasecmp" "string.h" HAVE_STRCASECMP) check_symbol_exists("strcasecmp" "string.h" HAVE_STRCASECMP)
check_symbol_exists("stricmp" "string.h" HAVE_STRICMP) check_symbol_exists("stricmp" "string.h" HAVE_STRICMP)
check_symbol_exists("strcmpi" "string.h" HAVE_STRCMPI) check_symbol_exists("strcmpi" "string.h" HAVE_STRCMPI)
endif() endif()
check_function_exists("setmode" HAVE_SETMODE) check_function_exists("setmode" HAVE_SETMODE)

2
docs/BINDINGS.md
View File

@@ -61,7 +61,7 @@ Go: [go-curl](https://github.com/andelf/go-curl) by ShuYu Wang
[Haskell](https://hackage.haskell.org/package/curl) Written by Galois, Inc [Haskell](https://hackage.haskell.org/package/curl) Written by Galois, Inc
[Hollywood](https://web.archive.org/web/20250116185836/https://www.hollywood-mal.com/download.html) hURL by Andreas Falkenhahn [Hollywood](https://web.archive.org/web/20250116185836/www.hollywood-mal.com/download.html) hURL by Andreas Falkenhahn
[Java](https://github.com/covers1624/curl4j) [Java](https://github.com/covers1624/curl4j)

2
docs/HTTP3.md
View File

@@ -54,7 +54,7 @@ versions do not work.
Build OpenSSL (version 3.5.0 or newer): Build OpenSSL (version 3.5.0 or newer):
% git clone --quiet --depth=1 -b openssl-$OPENSSL_VERSION https://github.com/openssl/openssl % git clone --depth 1 -b openssl-$OPENSSL_VERSION https://github.com/openssl/openssl
% cd openssl % cd openssl
% ./config --prefix=<somewhere1> --libdir=lib % ./config --prefix=<somewhere1> --libdir=lib
% make % make

4
docs/THANKS
View File

@@ -361,7 +361,7 @@ Benjamin Sergeant
Ben Kohler Ben Kohler
Ben Madsen Ben Madsen
Ben Noordhuis Ben Noordhuis
Benoit Neil Benoit Neil (Sukender)
Benoit Pierre Benoit Pierre
Benoit Sigoure Benoit Sigoure
Ben Van Hof Ben Van Hof
@@ -3148,6 +3148,7 @@ Temprimus
Terence Eden Terence Eden
Terri Oda Terri Oda
Terry Wu Terry Wu
Tetetest
thanhchungbtc on github thanhchungbtc on github
TheAssassin on github TheAssassin on github
TheBitBrine TheBitBrine
@@ -3328,6 +3329,7 @@ UrsusArctos on github
User Sg User Sg
ustcqidi on github ustcqidi on github
Vadim Grinshpun Vadim Grinshpun
Vaibhav Kumar
Valentin David Valentin David
Valentín Gutiérrez Valentín Gutiérrez
Valentin Richter Valentin Richter

2
docs/examples/crawler.c
View File

@@ -170,7 +170,7 @@ static size_t follow_links(CURLM *multi, struct memory *mem,
return count; return count;
} }
static int is_html(char *ctype) static int is_html(const char *ctype)
{ {
return ctype != NULL && strlen(ctype) > 10 && strstr(ctype, "text/html"); return ctype != NULL && strlen(ctype) > 10 && strstr(ctype, "text/html");
} }

2
docs/examples/ftpuploadfrommem.c
View File

@@ -48,7 +48,7 @@ struct WriteThis {
static size_t read_cb(char *ptr, size_t size, size_t nmemb, void *userp) static size_t read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
{ {
struct WriteThis *upload = (struct WriteThis *)userp; struct WriteThis *upload = (struct WriteThis *)userp;
size_t max = size*nmemb; size_t max = size * nmemb;
if(max < 1) if(max < 1)
return 0; return 0;

2
docs/examples/ftpuploadresume.c
View File

@@ -39,7 +39,7 @@ static size_t getcontentlengthfunc(void *ptr, size_t size, size_t nmemb,
r = sscanf(ptr, "Content-Length: %ld\n", &len); r = sscanf(ptr, "Content-Length: %ld\n", &len);
if(r == 1) if(r == 1)
*((long *) stream) = len; *((long *)stream) = len;
return size * nmemb; return size * nmemb;
} }

4
docs/examples/ghiper.c
View File

@@ -430,9 +430,9 @@ int init_fifo(void)
int main(void) int main(void)
{ {
struct GlobalInfo *g = g_malloc0(sizeof(struct GlobalInfo)); struct GlobalInfo *g = g_malloc0(sizeof(struct GlobalInfo));
GMainLoop*gmain; GMainLoop *gmain;
int fd; int fd;
GIOChannel* ch; GIOChannel *ch;
CURLcode res = curl_global_init(CURL_GLOBAL_ALL); CURLcode res = curl_global_init(CURL_GLOBAL_ALL);
if(res) if(res)

2
docs/examples/headerapi.c
View File

@@ -33,7 +33,7 @@ static size_t write_cb(char *data, size_t n, size_t l, void *userp)
/* take care of the data here, ignored in this example */ /* take care of the data here, ignored in this example */
(void)data; (void)data;
(void)userp; (void)userp;
return n*l; return n * l;
} }
int main(void) int main(void)

2
docs/examples/http2-upload.c
View File

@@ -88,7 +88,7 @@ struct input {
int num; int num;
}; };
static void dump(const char *text, int num, unsigned char *ptr, static void dump(const char *text, int num, const unsigned char *ptr,
size_t size, char nohex) size_t size, char nohex)
{ {
size_t i; size_t i;

2
docs/examples/multi-debugcallback.c
View File

@@ -34,7 +34,7 @@
#define TRUE 1 #define TRUE 1
static void dump(const char *text, FILE *stream, unsigned char *ptr, static void dump(const char *text, FILE *stream, const unsigned char *ptr,
size_t size, char nohex) size_t size, char nohex)
{ {
size_t i; size_t i;

24
lib/cf-socket.c
View File

@@ -171,8 +171,7 @@ tcpkeepalive(struct Curl_cfilter *cf,
if(setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, if(setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE,
(void *)&optval, sizeof(optval)) < 0) { (void *)&optval, sizeof(optval)) < 0) {
CURL_TRC_CF(data, cf, "Failed to set SO_KEEPALIVE on fd " CURL_TRC_CF(data, cf, "Failed to set SO_KEEPALIVE on fd "
"%" FMT_SOCKET_T ": errno %d", "%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
sockfd, SOCKERRNO);
} }
else { else {
#ifdef USE_WINSOCK #ifdef USE_WINSOCK
@@ -187,22 +186,19 @@ tcpkeepalive(struct Curl_cfilter *cf,
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
(const char *)&optval, sizeof(optval)) < 0) { (const char *)&optval, sizeof(optval)) < 0) {
CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPIDLE on fd " CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPIDLE on fd "
"%" FMT_SOCKET_T ": errno %d", "%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
sockfd, SOCKERRNO);
} }
optval = curlx_sltosi(data->set.tcp_keepintvl); optval = curlx_sltosi(data->set.tcp_keepintvl);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL,
(const char *)&optval, sizeof(optval)) < 0) { (const char *)&optval, sizeof(optval)) < 0) {
CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPINTVL on fd " CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPINTVL on fd "
"%" FMT_SOCKET_T ": errno %d", "%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
sockfd, SOCKERRNO);
} }
optval = curlx_sltosi(data->set.tcp_keepcnt); optval = curlx_sltosi(data->set.tcp_keepcnt);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPCNT, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPCNT,
(const char *)&optval, sizeof(optval)) < 0) { (const char *)&optval, sizeof(optval)) < 0) {
CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPCNT on fd " CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPCNT on fd "
"%" FMT_SOCKET_T ": errno %d", "%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
sockfd, SOCKERRNO);
} }
} }
else else
@@ -239,8 +235,7 @@ tcpkeepalive(struct Curl_cfilter *cf,
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
(void *)&optval, sizeof(optval)) < 0) { (void *)&optval, sizeof(optval)) < 0) {
CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPIDLE on fd " CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPIDLE on fd "
"%" FMT_SOCKET_T ": errno %d", "%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
sockfd, SOCKERRNO);
} }
#elif defined(TCP_KEEPALIVE) #elif defined(TCP_KEEPALIVE)
/* macOS style */ /* macOS style */
@@ -249,8 +244,7 @@ tcpkeepalive(struct Curl_cfilter *cf,
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE,
(void *)&optval, sizeof(optval)) < 0) { (void *)&optval, sizeof(optval)) < 0) {
CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPALIVE on fd " CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPALIVE on fd "
"%" FMT_SOCKET_T ": errno %d", "%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
sockfd, SOCKERRNO);
} }
#elif defined(TCP_KEEPALIVE_THRESHOLD) #elif defined(TCP_KEEPALIVE_THRESHOLD)
/* Solaris <11.4 style */ /* Solaris <11.4 style */
@@ -259,8 +253,7 @@ tcpkeepalive(struct Curl_cfilter *cf,
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE_THRESHOLD, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE_THRESHOLD,
(void *)&optval, sizeof(optval)) < 0) { (void *)&optval, sizeof(optval)) < 0) {
CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPALIVE_THRESHOLD on fd " CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPALIVE_THRESHOLD on fd "
"%" FMT_SOCKET_T ": errno %d", "%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
sockfd, SOCKERRNO);
} }
#endif #endif
#ifdef TCP_KEEPINTVL #ifdef TCP_KEEPINTVL
@@ -269,8 +262,7 @@ tcpkeepalive(struct Curl_cfilter *cf,
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL,
(void *)&optval, sizeof(optval)) < 0) { (void *)&optval, sizeof(optval)) < 0) {
CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPINTVL on fd " CURL_TRC_CF(data, cf, "Failed to set TCP_KEEPINTVL on fd "
"%" FMT_SOCKET_T ": errno %d", "%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
sockfd, SOCKERRNO);
} }
#elif defined(TCP_KEEPALIVE_ABORT_THRESHOLD) #elif defined(TCP_KEEPALIVE_ABORT_THRESHOLD)
/* Solaris <11.4 style */ /* Solaris <11.4 style */

6
lib/curl_ntlm_core.c
View File

@@ -469,13 +469,13 @@ static void time2filetime(struct ms_filetime *ft, time_t t)
{ {
#if SIZEOF_TIME_T > 4 #if SIZEOF_TIME_T > 4
t = (t + (curl_off_t)11644473600) * 10000000; t = (t + (curl_off_t)11644473600) * 10000000;
ft->dwLowDateTime = (unsigned int) (t & 0xFFFFFFFF); ft->dwLowDateTime = (unsigned int)(t & 0xFFFFFFFF);
ft->dwHighDateTime = (unsigned int) (t >> 32); ft->dwHighDateTime = (unsigned int)(t >> 32);
#else #else
unsigned int r, s; unsigned int r, s;
unsigned int i; unsigned int i;
ft->dwLowDateTime = (unsigned int)t & 0xFFFFFFFF; ft->dwLowDateTime = (unsigned int)(t & 0xFFFFFFFF);
ft->dwHighDateTime = 0; ft->dwHighDateTime = 0;
# ifndef HAVE_TIME_T_UNSIGNED # ifndef HAVE_TIME_T_UNSIGNED

2
lib/parsedate.c
View File

@@ -286,7 +286,7 @@ enum assume {
static time_t time2epoch(int sec, int min, int hour, static time_t time2epoch(int sec, int min, int hour,
int mday, int mon, int year) int mday, int mon, int year)
{ {
static const int month_days_cumulative [12] = static const int month_days_cumulative[12] =
{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
int leap_days = year - (mon <= 1); int leap_days = year - (mon <= 1);
leap_days = ((leap_days / 4) - (leap_days / 100) + (leap_days / 400) leap_days = ((leap_days / 4) - (leap_days / 100) + (leap_days / 400)

4
lib/tftp.c
View File

@@ -241,7 +241,7 @@ static CURLcode tftp_set_timeouts(struct tftp_conn *state)
state->retry_time = 1; state->retry_time = 1;
infof(state->data, infof(state->data,
"set timeouts for state %d; Total % " FMT_OFF_T ", retry %d maxtry %d", "set timeouts for state %d; Total %" FMT_OFF_T ", retry %d maxtry %d",
(int)state->state, timeout_ms, state->retry_time, state->retry_max); (int)state->state, timeout_ms, state->retry_time, state->retry_max);
/* init RX time */ /* init RX time */
@@ -381,7 +381,7 @@ static CURLcode tftp_parse_option_ack(struct tftp_conn *state,
static CURLcode tftp_option_add(struct tftp_conn *state, size_t *csize, static CURLcode tftp_option_add(struct tftp_conn *state, size_t *csize,
char *buf, const char *option) char *buf, const char *option)
{ {
if(( strlen(option) + *csize + 1) > (size_t)state->blksize) if((strlen(option) + *csize + 1) > (size_t)state->blksize)
return CURLE_TFTP_ILLEGAL; return CURLE_TFTP_ILLEGAL;
strcpy(buf, option); strcpy(buf, option);
*csize += strlen(option) + 1; *csize += strlen(option) + 1;

2
lib/vtls/rustls.c
View File

@@ -494,7 +494,7 @@ add_ciphers:
for(j = 0; j < default_len; j++) { for(j = 0; j < default_len; j++) {
entry = rustls_default_crypto_provider_ciphersuites_get(j); entry = rustls_default_crypto_provider_ciphersuites_get(j);
if(rustls_supported_ciphersuite_protocol_version(entry) == if(rustls_supported_ciphersuite_protocol_version(entry) ==
RUSTLS_TLS_VERSION_TLSV1_3) RUSTLS_TLS_VERSION_TLSV1_3)
continue; continue;
/* No duplicates allowed (so selected cannot overflow) */ /* No duplicates allowed (so selected cannot overflow) */

4
lib/vtls/schannel.c
View File

@@ -566,8 +566,8 @@ schannel_acquire_credential_handle(struct Curl_cfilter *cf,
} }
} }
if((fInCert || blob) && (data->set.ssl.cert_type) && if((fInCert || blob) && data->set.ssl.cert_type &&
(!curl_strequal(data->set.ssl.cert_type, "P12"))) { !curl_strequal(data->set.ssl.cert_type, "P12")) {
failf(data, "schannel: certificate format compatibility error " failf(data, "schannel: certificate format compatibility error "
" for %s", " for %s",
blob ? "(memory blob)" : data->set.ssl.primary.clientcert); blob ? "(memory blob)" : data->set.ssl.primary.clientcert);

2
lib/ws.c
View File

@@ -2016,4 +2016,4 @@ CURL_EXTERN CURLcode curl_ws_start_frame(CURL *curl,
return CURLE_NOT_BUILT_IN; return CURLE_NOT_BUILT_IN;
} }
#endif /* !CURL_DISABLE_WEBSOCKETS */ #endif /* !CURL_DISABLE_WEBSOCKETS && !CURL_DISABLE_HTTP */

2
scripts/mk-ca-bundle.pl
View File

@@ -357,7 +357,7 @@ if(!$opt_n) {
report "LWP is not available (LWP::UserAgent not found)"; report "LWP is not available (LWP::UserAgent not found)";
exit 1; exit 1;
} }
my $ua = new LWP::UserAgent(agent => "$0/$version"); my $ua = new LWP::UserAgent(agent => "$0/$version");
$ua->env_proxy(); $ua->env_proxy();
$resp = $ua->mirror($url, $txt); $resp = $ua->mirror($url, $txt);
if($resp && $resp->code eq '304') { if($resp && $resp->code eq '304') {

2
scripts/perlcheck.sh
View File

@@ -42,7 +42,7 @@ echo "parallel: ${procs}"
elif git rev-parse --is-inside-work-tree >/dev/null 2>&1; then elif git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
{ {
git ls-files | grep -E '\.(pl|pm)$' git ls-files | grep -E '\.(pl|pm)$'
git grep -l -E '^#!/usr/bin/env perl' git grep -l '^#!/usr/bin/env perl'
} | sort -u } | sort -u
else else
# strip off the leading ./ to make the grep regexes work properly # strip off the leading ./ to make the grep regexes work properly

8
tests/ech_combos.py
View File

@@ -31,7 +31,7 @@
# ECH command line args # ECH command line args
def CombinationRepetitionUtil(chosen, arr, badarr, index, def CombinationRepetitionUtil(chosen, arr, badarr, index,
r, start, end): r, start, end):
# Current combination is ready, # Current combination is ready,
# print it # print it
@@ -68,9 +68,9 @@ def CombinationRepetitionUtil(chosen, arr, badarr, index,
# with next (Note that i+1 is passed, # with next (Note that i+1 is passed,
# but index is not changed) # but index is not changed)
CombinationRepetitionUtil(chosen, arr, badarr, index + 1, CombinationRepetitionUtil(chosen, arr, badarr, index + 1,
r, start, end) r, start, end)
CombinationRepetitionUtil(chosen, arr, badarr, index, CombinationRepetitionUtil(chosen, arr, badarr, index,
r, start + 1, end) r, start + 1, end)
# The main function that prints all # The main function that prints all
# combinations of size r in arr[] of # combinations of size r in arr[] of
@@ -94,5 +94,3 @@ r = 8
n = len(arr) - 1 n = len(arr) - 1
CombinationRepetition(arr, badarr, n, r) CombinationRepetition(arr, badarr, n, r)
# This code is contributed by Vaibhav Kumar 12.

2
tests/ftpserver.pl
View File

@@ -3044,7 +3044,7 @@ while(@ARGV) {
} }
} }
else { else {
print STDERR "\nWarning: ftpserver.pl unknown parameter: $ARGV[0]\n"; print STDERR "\nWarning: ftpserver.pl unknown parameter: '$ARGV[0]'\n";
} }
shift @ARGV; shift @ARGV;
} }

2
tests/getpart.pm
View File

@@ -398,7 +398,7 @@ sub writearray {
my ($filename, $arrayref)=@_; my ($filename, $arrayref)=@_;
open(my $temp, ">", "$filename") || die "Failure writing file"; open(my $temp, ">", "$filename") || die "Failure writing file";
binmode($temp,":raw"); # Cygwin fix by Kevin Roth binmode($temp,":raw"); # Cygwin fix
for(@$arrayref) { for(@$arrayref) {
print $temp $_; print $temp $_;
} }

2
tests/http-server.pl
View File

@@ -140,7 +140,7 @@ while(@ARGV) {
$verbose = 1; $verbose = 1;
} }
else { else {
print STDERR "\nWarning: http-server.pl unknown parameter: $ARGV[0]\n"; print STDERR "\nWarning: http-server.pl unknown parameter: '$ARGV[0]'\n";
} }
shift @ARGV; shift @ARGV;
} }

2
tests/http2-server.pl
View File

@@ -102,7 +102,7 @@ while(@ARGV) {
} }
} }
elsif($ARGV[0]) { elsif($ARGV[0]) {
print STDERR "\nWarning: http2-server.pl unknown parameter: $ARGV[0]\n"; print STDERR "\nWarning: http2-server.pl unknown parameter: '$ARGV[0]'\n";
} }
shift @ARGV; shift @ARGV;
} }

2
tests/http3-server.pl
View File

@@ -102,7 +102,7 @@ while(@ARGV) {
} }
} }
else { else {
print STDERR "\nWarning: http3-server.pl unknown parameter: $ARGV[0]\n"; print STDERR "\nWarning: http3-server.pl unknown parameter: '$ARGV[0]'\n";
} }
shift @ARGV; shift @ARGV;
} }

2
tests/rtspserver.pl
View File

@@ -104,7 +104,7 @@ while(@ARGV) {
$verbose = 1; $verbose = 1;
} }
else { else {
print STDERR "\nWarning: rtspserver.pl unknown parameter: $ARGV[0]\n"; print STDERR "\nWarning: rtspserver.pl unknown parameter: '$ARGV[0]'\n";
} }
shift @ARGV; shift @ARGV;
} }

2
tests/secureserver.pl
View File

@@ -176,7 +176,7 @@ while(@ARGV) {
$mtls = 1; $mtls = 1;
} }
else { else {
print STDERR "\nWarning: secureserver.pl unknown parameter: $ARGV[0]\n"; print STDERR "\nWarning: secureserver.pl unknown parameter: '$ARGV[0]'\n";
} }
shift @ARGV; shift @ARGV;
} }

2
tests/sshserver.pl
View File

@@ -191,7 +191,7 @@ while(@ARGV) {
} }
} }
else { else {
print STDERR "\nWarning: sshserver.pl unknown parameter: $ARGV[0]\n"; print STDERR "\nWarning: sshserver.pl unknown parameter: '$ARGV[0]'\n";
} }
shift @ARGV; shift @ARGV;
} }

2
tests/tftpserver.pl
View File

@@ -104,7 +104,7 @@ while(@ARGV) {
$verbose = 1; $verbose = 1;
} }
else { else {
print STDERR "\nWarning: tftpserver.pl unknown parameter: $ARGV[0]\n"; print STDERR "\nWarning: tftpserver.pl unknown parameter: '$ARGV[0]'\n";
} }
shift @ARGV; shift @ARGV;
} }