romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-30 05:47:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

misc: fix code quality findings

Browse source 
- httpsrr: drop redundant checks.
  Follow-up to 809dda3a37 #21354
- httpsrr.h: drop obsolete comment.
  Follow-up to 2b3dfb4ad4 #21175
- ws: drop redundant check in `curl_ws_start_frame()`.
  Follow-up to 37cecfc7b9 #17683
- ws: fix typo in comment.
- tool_operate: fix VMS build. (broken since 2019-07-20, v7.66.0)
  Follow-up to b889408500 #3804

Pointed out by Copilot Code Quality

Closes #21393
This commit is contained in:
Viktor Szakats 2026-04-21 10:14:16 +02:00
parent 2e3607034d
commit 8eb3cb75a3
No known key found for this signature in database
4 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/httpsrr.c
View file

@ -249,10 +249,9 @@ bool Curl_httpsrr_applicable(struct Curl_easy *data,
{
if(!data->conn || !rr)
return FALSE;
return (data->conn && rr &&
(!rr->target || !rr->target[0] ||
(rr->target[0] == '.' && !rr->target[1])) &&
(!rr->port_set || rr->port == data->conn->remote_port));
return (!rr->target || !rr->target[0] ||
(rr->target[0] == '.' && !rr->target[1])) &&
(!rr->port_set || rr->port == data->conn->remote_port);
}
#ifdef USE_ARES

2
lib/httpsrr.h
View file

@ -52,7 +52,7 @@ struct Curl_https_rrinfo {
size_t ipv6hints_len;
unsigned char alpns[MAX_HTTPSRR_ALPNS]; /* keytag = 1 */
/* store parsed alpnid entries in the array, end with ALPN_none */
uint16_t port; /* -1 means not set */
uint16_t port;
uint16_t priority;
BIT(no_def_alpn); /* keytag = 2 */
BIT(mandatory); /* keytag = 0 */

9
lib/ws.c
View file

@ -564,7 +564,7 @@ static CURLcode ws_dec_pass(struct ws_decoder *dec,
dec->state = WS_DEC_INIT;
break;
default:
/* we covered all enums above, but some code analyzers are whimps */
/* we covered all enums above, but some code analyzers are wimps */
result = CURLE_FAILED_INIT;
}
return result;
@ -1878,6 +1878,7 @@ CURL_EXTERN CURLcode curl_ws_start_frame(CURL *curl,
if(!GOOD_EASY_HANDLE(data))
return CURLE_BAD_FUNCTION_ARGUMENT;
if(data->set.ws_raw_mode) {
failf(data, "cannot curl_ws_start_frame() with CURLWS_RAW_MODE enabled");
return CURLE_FAILED_INIT;
@ -1898,12 +1899,6 @@ CURL_EXTERN CURLcode curl_ws_start_frame(CURL *curl,
goto out;
}
if(data->set.ws_raw_mode) {
failf(data, "[WS] cannot start frame in raw mode");
result = CURLE_SEND_ERROR;
goto out;
}
if(ws->enc.payload_remain) {
failf(data, "[WS] previous frame not finished");
result = CURLE_SEND_ERROR;

4
src/tool_operate.c
View file

@ -269,7 +269,7 @@ static CURLcode pre_transfer(struct per_transfer *per)
/* Calculate the real upload size for VMS */
per->infd = -1;
if(curlx_stat(per->uploadfile, &fileinfo) == 0) {
fileinfo.st_size = VmsSpecialSize(uploadfile, &fileinfo);
fileinfo.st_size = VmsSpecialSize(per->uploadfile, &fileinfo);
switch(fileinfo.st_fab_rfm) {
case FAB$C_VAR:
case FAB$C_VFC:
@ -1129,7 +1129,7 @@ static CURLcode setup_outfile(struct OperationConfig *config,
#ifdef __VMS
/* 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",
FILE *file = curlx_fopen(per->outfile, "ab",
"ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0");
#else
/* open file for output: */