← Commit list

6f0e212f6e

Viktor Szakats
Viktor Szakats
2025-10-06
SUCCESS Duration: 153s

Subject

tidy-up: miscellaneous (cont.)

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 →

.github/scripts/typos.toml +4 -7.github/workflows/label.yml +1 -0configure.ac +1 -1docs/examples/multi-event.c +1 -1docs/examples/multi-uv.c +1 -1lib/amigaos.c +2 -2lib/cf-ip-happy.c +3 -3lib/curl_trc.c +1 -0lib/rtsp.c +1 -1lib/vauth/digest_sspi.c +1 -1lib/vauth/ntlm_sspi.c +1 -1lib/vquic/curl_ngtcp2.c +2 -2lib/vtls/openssl.c +3 -3src/Makefile.inc +3 -3src/tool_operate.c +1 -1tests/libtest/lib517.c +1 -1tests/server/sockfilt.c +2 -2
.github/scripts/typos.toml+4 -7
@@ -9,13 +9,10 @@ extend-ignore-identifiers-re = [
"^(ECT0|ECT1|HELO|htpt|PASE)$",
"^[A-Za-z0-9_-]*(EDE|GOST)[A-Z0-9_-]*$", # ciphers
"^0x[0-9a-fA-F]+FUL$", # unsigned long hex literals ending with 'F'
- "^[0-9a-zA-Z+]{64,}$", # possibly base64
- "^(Januar|eyeballers|HELO_smtp|kno22|MkTypLibCompatible|optin|passin|perfec|__SecURE|SMTP_HELO|v_alue)$",
- "^(clen|req_clen|smtp_perform_helo|smtp_state_helo_resp|_stati64)$",
- "^Tru64$",
+ "^(eyeballers|HELO_smtp|optin|passin|perfec|SMTP_HELO)$",
+ "^(clen|req_clen|smtp_perform_helo|smtp_state_helo_resp|Tru64|_stati64)$",
"secur32",
- # this should be limited to tests/http/*. Short for secure proxy.
- "proxys",
+ "proxys", # this should be limited to tests/http/*. Short for secure proxy.
]
extend-ignore-re = [
@@ -28,8 +25,8 @@ extend-exclude = [
".github/scripts/spellcheck.words",
"docs/THANKS",
"packages/*",
- "scripts/wcurl",
"projects/Windows/tmpl/curl.vcxproj",
"projects/Windows/tmpl/libcurl.vcxproj",
+ "scripts/wcurl",
"tests/data/test*",
]
.github/workflows/label.yml+1 -0
@@ -10,6 +10,7 @@
# https://github.com/actions/labeler
name: 'Labeler'
+
'on': [pull_request_target] # zizmor: ignore[dangerous-triggers]
permissions: {}
configure.ac+1 -1
@@ -281,7 +281,7 @@ OPT_APPLE_SECTRUST=$curl_cv_apple
AC_ARG_WITH(apple-sectrust,dnl
AS_HELP_STRING([--with-apple-sectrust],[enable Apple OS native certificate verification]),[
OPT_APPLE_SECTRUST=$withval
- ])
+])
AC_PATH_PROG(PERL, perl,, $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin)
AC_SUBST(PERL)
docs/examples/multi-event.c+1 -1
@@ -69,7 +69,7 @@ static void add_download(const char *url, int num)
FILE *file;
CURL *handle;
- snprintf(filename, 50, "%d.download", num);
+ snprintf(filename, sizeof(filename), "%d.download", num);
file = fopen(filename, "wb");
if(!file) {
docs/examples/multi-uv.c+1 -1
@@ -85,7 +85,7 @@ static void add_download(const char *url, int num, CURLM *multi)
FILE *file;
CURL *handle;
- snprintf(filename, 50, "%d.download", num);
+ snprintf(filename, sizeof(filename), "%d.download", num);
file = fopen(filename, "wb");
if(!file) {
lib/amigaos.c+2 -2
@@ -222,8 +222,8 @@ CURLcode Curl_amiga_init(void)
return CURLE_FAILED_INIT;
}
- if(SocketBaseTags(SBTM_SETVAL(SBTC_ERRNOPTR(sizeof(errno))), (ULONG) &errno,
- SBTM_SETVAL(SBTC_LOGTAGPTR), (ULONG) "curl",
+ if(SocketBaseTags(SBTM_SETVAL(SBTC_ERRNOPTR(sizeof(errno))), (ULONG)&errno,
+ SBTM_SETVAL(SBTC_LOGTAGPTR), (ULONG)"curl",
TAG_DONE)) {
CURL_AMIGA_REQUEST("SocketBaseTags ERROR");
return CURLE_FAILED_INIT;
lib/cf-ip-happy.c+3 -3
@@ -412,9 +412,9 @@ evaluate:
if(!more_possible)
more_possible = cf_ai_iter_has_more(&bs->ipv6_iter);
#endif
- do_more = more_possible &&
- (curlx_timediff(now, bs->last_attempt_started) >=
- bs->attempt_delay_ms);
+ do_more = more_possible &&
+ (curlx_timediff(now, bs->last_attempt_started) >=
+ bs->attempt_delay_ms);
if(do_more)
CURL_TRC_CF(data, cf, "happy eyeballs timeout expired, "
"start next attempt");
lib/curl_trc.c+1 -0
@@ -312,6 +312,7 @@ void Curl_trc_timer(struct Curl_easy *data, int tid, const char *fmt, ...)
va_end(ap);
}
}
+
void Curl_trc_easy_timers(struct Curl_easy *data)
{
if(CURL_TRC_TIMER_is_verbose(data)) {
lib/rtsp.c+1 -1
@@ -558,7 +558,7 @@ static CURLcode rtsp_do(struct Curl_easy *data, bool *done)
* Go ahead and use the Range stuff supplied for HTTP
*/
if(data->state.use_range &&
- (rtspreq & (RTSPREQ_PLAY | RTSPREQ_PAUSE | RTSPREQ_RECORD))) {
+ (rtspreq & (RTSPREQ_PLAY | RTSPREQ_PAUSE | RTSPREQ_RECORD))) {
/* Check to see if there is a range set in the custom headers */
if(!Curl_checkheaders(data, STRCONST("Range")) && data->state.range) {
lib/vauth/digest_sspi.c+1 -1
@@ -364,7 +364,7 @@ CURLcode Curl_auth_decode_digest_http_message(const char *chlg,
}
/* Store the challenge for use later */
- digest->input_token = (BYTE *) Curl_memdup(chlg, chlglen + 1);
+ digest->input_token = (BYTE *)Curl_memdup(chlg, chlglen + 1);
if(!digest->input_token)
return CURLE_OUT_OF_MEMORY;
lib/vauth/ntlm_sspi.c+1 -1
@@ -175,7 +175,7 @@ CURLcode Curl_auth_create_ntlm_type1_message(struct Curl_easy *data,
ntlm->context, &type_1_desc,
&attrs, NULL);
if(status == SEC_I_COMPLETE_NEEDED ||
- status == SEC_I_COMPLETE_AND_CONTINUE)
+ status == SEC_I_COMPLETE_AND_CONTINUE)
Curl_pSecFn->CompleteAuthToken(ntlm->context, &type_1_desc);
else if(status == SEC_E_INSUFFICIENT_MEMORY)
return CURLE_OUT_OF_MEMORY;
lib/vquic/curl_ngtcp2.c+2 -2
@@ -143,8 +143,8 @@ struct cf_ngtcp2_ctx {
uint64_t max_bidi_streams; /* max bidi streams we can open */
size_t earlydata_max; /* max amount of early data supported by
server on session reuse */
- size_t earlydata_skip; /* sending bytes to skip when earlydata
- * is accepted by peer */
+ size_t earlydata_skip; /* sending bytes to skip when earlydata
+ is accepted by peer */
CURLcode tls_vrfy_result; /* result of TLS peer verification */
int qlogfd;
BIT(initialized);
lib/vtls/openssl.c+3 -3
@@ -3358,9 +3358,9 @@ static CURLcode ossl_windows_load_anchors(struct Curl_cfilter *cf,
#endif /* USE_WIN32_CRYPTO */
static CURLcode ossl_load_trust_anchors(struct Curl_cfilter *cf,
- struct Curl_easy *data,
- struct ossl_ctx *octx,
- X509_STORE *store)
+ struct Curl_easy *data,
+ struct ossl_ctx *octx,
+ X509_STORE *store)
{
struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);
src/Makefile.inc+3 -3
@@ -34,9 +34,9 @@
# the official API, but we reuse the code here to avoid duplication.
CURLX_CFILES = \
../lib/curlx/base64.c \
- ../lib/curlx/multibyte.c \
../lib/curlx/dynbuf.c \
../lib/curlx/fopen.c \
+ ../lib/curlx/multibyte.c \
../lib/curlx/nonblock.c \
../lib/curlx/strerr.c \
../lib/curlx/strparse.c \
@@ -48,11 +48,11 @@ CURLX_CFILES = \
../lib/curlx/winapi.c
CURLX_HFILES = \
- ../lib/curlx/binmode.h \
- ../lib/curlx/multibyte.h \
../lib/curl_setup.h \
+ ../lib/curlx/binmode.h \
../lib/curlx/dynbuf.h \
../lib/curlx/fopen.h \
+ ../lib/curlx/multibyte.h \
../lib/curlx/nonblock.h \
../lib/curlx/strerr.h \
../lib/curlx/strparse.h \
src/tool_operate.c+1 -1
@@ -999,7 +999,7 @@ static CURLcode setup_outfile(struct OperationConfig *config,
/* open file for output, forcing VMS output format into stream
mode which is needed for stat() call above to always work. */
FILE *file = curlx_fopen(outfile, "ab",
- "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0");
+ "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0");
#else
/* open file for output: */
FILE *file = curlx_fopen(per->outfile, "ab");
tests/libtest/lib517.c+1 -1
@@ -80,7 +80,7 @@ static CURLcode test_lib517(const char *URL)
{"Sat, 15-Apr-17\"21:01:22\"GMT", 1492290082 },
{"Partyday, 18- April-07 22:50:12", -1 },
{"Partyday, 18 - Apri-07 22:50:12", -1 },
- {"Wednes, 1-Januar-2003 00:00:00 GMT", -1 },
+ {"Wednes, 1-Januar-2003 00:00:00 GMT", -1 },/* spellchecker:disable-line */
{"Sat, 15-Apr-17 21:01:22", 1492290082 },
{"Sat, 15-Apr-17 21:01:22 GMT-2", 1492290082 },
{"Sat, 15-Apr-17 21:01:22 GMT BLAH", 1492290082 },
tests/server/sockfilt.c+2 -2
@@ -461,13 +461,13 @@ static DWORD WINAPI select_ws_wait_thread(void *lpParameter)
size.QuadPart = 0;
size.LowPart = GetFileSize(handle, &length);
if((size.LowPart != INVALID_FILE_SIZE) ||
- (GetLastError() == NO_ERROR)) {
+ (GetLastError() == NO_ERROR)) {
size.HighPart = (LONG)length;
/* get the current position within the file */
pos.QuadPart = 0;
pos.LowPart = SetFilePointer(handle, 0, &pos.HighPart, FILE_CURRENT);
if((pos.LowPart != INVALID_SET_FILE_POINTER) ||
- (GetLastError() == NO_ERROR)) {
+ (GetLastError() == NO_ERROR)) {
/* compare position with size, abort if not equal */
if(size.QuadPart == pos.QuadPart) {
/* sleep and continue waiting */