romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 07:03:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

clang-tidy: enable readability-math-missing-parentheses, adjust code

Browse source 
No functional changes.

Also:
- md4, md5: drop redundant parentheses from macro values.

Closes #20691
This commit is contained in:
Viktor Szakats 2026-02-23 00:59:57 +01:00
parent 29bca12978
commit 65262be0ab
No known key found for this signature in database
40 changed files with 85 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/cf-h1-proxy.c
View file

@ -340,8 +340,8 @@ static CURLcode on_resp_header(struct Curl_cfilter *cf,
ISDIGIT(header[9]) && ISDIGIT(header[10]) && ISDIGIT(header[11]) &&
!ISDIGIT(header[12])) {
/* store the HTTP code from the proxy */
data->info.httpproxycode = k->httpcode = (header[9] - '0') * 100 +
(header[10] - '0') * 10 + (header[11] - '0');
data->info.httpproxycode = k->httpcode = ((header[9] - '0') * 100) +
((header[10] - '0') * 10) + (header[11] - '0');
}
return result;
}

4
lib/curl_ntlm_core.c
View file

@ -399,7 +399,7 @@ static void ascii_to_unicode_le(unsigned char *dest, const char *src,
size_t i;
for(i = 0; i < srclen; i++) {
dest[2 * i] = (unsigned char)src[i];
dest[2 * i + 1] = '\0';
dest[(2 * i) + 1] = '\0';
}
}
@ -492,7 +492,7 @@ static void ascii_uppercase_to_unicode_le(unsigned char *dest,
size_t i;
for(i = 0; i < srclen; i++) {
dest[2 * i] = (unsigned char)(Curl_raw_toupper(src[i]));
dest[2 * i + 1] = '\0';
dest[(2 * i) + 1] = '\0';
}
}

2
lib/curlx/base64.c
View file

@ -182,7 +182,7 @@ static CURLcode base64_encode(const char *table64,
if(insize > CURL_MAX_BASE64_INPUT)
return CURLE_TOO_LARGE;
base64data = output = curlx_malloc((insize + 2) / 3 * 4 + 1);
base64data = output = curlx_malloc(((insize + 2) / 3 * 4) + 1);
if(!output)
return CURLE_OUT_OF_MEMORY;

4
lib/curlx/strparse.c
View file

@ -172,7 +172,7 @@ static int str_num_base(const char **linep, curl_off_t *nump, curl_off_t max,
/* special-case low max scenario because check needs to be different */
do {
int n = curlx_hexval(*p++);
num = num * base + n;
num = (num * base) + n;
if(num > max)
return STRE_OVERFLOW;
} while(valid_digit(*p, m));
@ -182,7 +182,7 @@ static int str_num_base(const char **linep, curl_off_t *nump, curl_off_t max,
int n = curlx_hexval(*p++);
if(num > ((max - n) / base))
return STRE_OVERFLOW;
num = num * base + n;
num = (num * base) + n;
} while(valid_digit(*p, m));
}
*nump = num;

6
lib/curlx/timeval.c
View file

@ -191,7 +191,7 @@ timediff_t curlx_ptimediff_ms(const struct curltime *newer,
return TIMEDIFF_T_MAX;
else if(diff <= (TIMEDIFF_T_MIN / 1000))
return TIMEDIFF_T_MIN;
return diff * 1000 + (newer->tv_usec - older->tv_usec) / 1000;
return (diff * 1000) + ((newer->tv_usec - older->tv_usec) / 1000);
}
@ -212,7 +212,7 @@ timediff_t curlx_timediff_ceil_ms(struct curltime newer,
return TIMEDIFF_T_MAX;
else if(diff <= (TIMEDIFF_T_MIN / 1000))
return TIMEDIFF_T_MIN;
return diff * 1000 + (newer.tv_usec - older.tv_usec + 999) / 1000;
return (diff * 1000) + ((newer.tv_usec - older.tv_usec + 999) / 1000);
}
/*
@ -227,7 +227,7 @@ timediff_t curlx_ptimediff_us(const struct curltime *newer,
return TIMEDIFF_T_MAX;
else if(diff <= (TIMEDIFF_T_MIN / 1000000))
return TIMEDIFF_T_MIN;
return diff * 1000000 + newer->tv_usec - older->tv_usec;
return (diff * 1000000) + newer->tv_usec - older->tv_usec;
}
timediff_t curlx_timediff_us(struct curltime newer, struct curltime older)

2
lib/escape.c
View file

@ -63,7 +63,7 @@ char *curl_easy_escape(CURL *data, const char *string, int inlength)
if(length > SIZE_MAX / 16)
return NULL;
curlx_dyn_init(&d, length * 3 + 1);
curlx_dyn_init(&d, (length * 3) + 1);
while(length--) {
/* treat the characters unsigned */

4
lib/ftp.c
View file

@ -2496,7 +2496,7 @@ static CURLcode ftp_state_port_resp(struct Curl_easy *data,
static int twodigit(const char *p)
{
return (p[0] - '0') * 10 + (p[1] - '0');
return ((p[0] - '0') * 10) + (p[1] - '0');
}
static bool ftp_213_date(const char *p, int *year, int *month, int *day,
@ -2505,7 +2505,7 @@ static bool ftp_213_date(const char *p, int *year, int *month, int *day,
size_t len = strlen(p);
if(len < 14)
return FALSE;
*year = twodigit(&p[0]) * 100 + twodigit(&p[2]);
*year = (twodigit(&p[0]) * 100) + twodigit(&p[2]);
*month = twodigit(&p[4]);
*day = twodigit(&p[6]);
*hour = twodigit(&p[8]);

2
lib/hmac.c
View file

@ -52,7 +52,7 @@ struct HMAC_context *Curl_HMAC_init(const struct HMAC_params *hashparams,
unsigned char b;
/* Create HMAC context. */
i = sizeof(*ctxt) + 2 * hashparams->ctxtsize + hashparams->resultlen;
i = sizeof(*ctxt) + (2 * hashparams->ctxtsize) + hashparams->resultlen;
ctxt = curlx_malloc(i);
if(!ctxt)

4
lib/http.c
View file

@ -4232,7 +4232,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data,
k->httpversion = (unsigned char)(10 + (p[1] - '0'));
p += 3;
if(ISDIGIT(p[0]) && ISDIGIT(p[1]) && ISDIGIT(p[2])) {
k->httpcode = (p[0] - '0') * 100 + (p[1] - '0') * 10 +
k->httpcode = ((p[0] - '0') * 100) + ((p[1] - '0') * 10) +
(p[2] - '0');
/* RFC 9112 requires a single space following the status code,
but the browsers do not so let's not insist */
@ -4252,7 +4252,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data,
k->httpversion = (unsigned char)((*p - '0') * 10);
p += 2;
if(ISDIGIT(p[0]) && ISDIGIT(p[1]) && ISDIGIT(p[2])) {
k->httpcode = (p[0] - '0') * 100 + (p[1] - '0') * 10 +
k->httpcode = ((p[0] - '0') * 100) + ((p[1] - '0') * 10) +
(p[2] - '0');
p += 3;
if(!ISBLANK(*p))

8
lib/http_aws_sigv4.c
View file

@ -53,7 +53,7 @@
#define TIMESTAMP_SIZE 17
/* hex-encoded with trailing null */
#define SHA256_HEX_LENGTH (2 * CURL_SHA256_DIGEST_LENGTH + 1)
#define SHA256_HEX_LENGTH ((2 * CURL_SHA256_DIGEST_LENGTH) + 1)
#define MAX_QUERY_COMPONENTS 128
@ -745,8 +745,10 @@ UNITTEST CURLcode canon_query(const char *query, struct dynbuf *dq)
in_key_len = offset - in_key;
}
curlx_dyn_init(&encoded_query_array[index].key, query_part_len * 3 + 1);
curlx_dyn_init(&encoded_query_array[index].value, query_part_len * 3 + 1);
curlx_dyn_init(&encoded_query_array[index].key,
(query_part_len * 3) + 1);
curlx_dyn_init(&encoded_query_array[index].value,
(query_part_len * 3) + 1);
counted_query_components++;
/* Decode/encode the key */

12
lib/md4.c
View file

@ -218,12 +218,12 @@ typedef struct md4_ctx MD4_CTX;
#define MD4_SET(n) (*(const uint32_t *)(const void *)&ptr[(n) * 4])
#define MD4_GET(n) MD4_SET(n)
#else
#define MD4_SET(n) (ctx->block[(n)] = \
(uint32_t)ptr[(n) * 4] | \
((uint32_t)ptr[(n) * 4 + 1] << 8) | \
((uint32_t)ptr[(n) * 4 + 2] << 16) | \
((uint32_t)ptr[(n) * 4 + 3] << 24))
#define MD4_GET(n) (ctx->block[(n)])
#define MD4_SET(n) (ctx->block[n] = \
(uint32_t)ptr[(n) * 4] | \
((uint32_t)ptr[((n) * 4) + 1] << 8) | \
((uint32_t)ptr[((n) * 4) + 2] << 16) | \
((uint32_t)ptr[((n) * 4) + 3] << 24))
#define MD4_GET(n) ctx->block[n]
#endif
/*

12
lib/md5.c
View file

@ -299,12 +299,12 @@ typedef struct md5_ctx my_md5_ctx;
#define MD5_SET(n) (*(const uint32_t *)(const void *)&ptr[(n) * 4])
#define MD5_GET(n) MD5_SET(n)
#else
#define MD5_SET(n) (ctx->block[(n)] = \
(uint32_t)ptr[(n) * 4] | \
((uint32_t)ptr[(n) * 4 + 1] << 8) | \
((uint32_t)ptr[(n) * 4 + 2] << 16) | \
((uint32_t)ptr[(n) * 4 + 3] << 24))
#define MD5_GET(n) (ctx->block[(n)])
#define MD5_SET(n) (ctx->block[n] = \
(uint32_t)ptr[(n) * 4] | \
((uint32_t)ptr[((n) * 4) + 1] << 8) | \
((uint32_t)ptr[((n) * 4) + 2] << 16) | \
((uint32_t)ptr[((n) * 4) + 3] << 24))
#define MD5_GET(n) ctx->block[n]
#endif
/*

2
lib/mime.c
View file

@ -426,7 +426,7 @@ static curl_off_t encoder_base64_size(curl_mimepart *part)
size = 4 * (1 + (size - 1) / 3);
/* Effective character count must include CRLFs. */
return size + 2 * ((size - 1) / MAX_ENCODED_LINE_LENGTH);
return size + (2 * ((size - 1) / MAX_ENCODED_LINE_LENGTH));
}
/* Quoted-printable lookahead.

11
lib/parsedate.c
View file

@ -279,9 +279,10 @@ static time_t time2epoch(int sec, int min, int hour,
int leap_days = year - (mon <= 1);
leap_days = ((leap_days / 4) - (leap_days / 100) + (leap_days / 400)
- (1969 / 4) + (1969 / 100) - (1969 / 400));
return ((((time_t)(year - 1970) * 365
+ leap_days + month_days_cumulative[mon] + mday - 1) * 24
+ hour) * 60 + min) * 60 + sec;
return ((((((((time_t)(year - 1970) * 365)
+ leap_days + month_days_cumulative[mon] + mday - 1) * 24)
+ hour) * 60)
+ min) * 60) + sec;
}
/* Returns the value of a single-digit or two-digit decimal number, return
@ -292,7 +293,7 @@ static int oneortwodigit(const char *date, const char **endp)
int num = date[0] - '0';
if(ISDIGIT(date[1])) {
*endp = &date[2];
return num * 10 + (date[1] - '0');
return (num * 10) + (date[1] - '0');
}
*endp = &date[1];
return num;
@ -445,7 +446,7 @@ static int parsedate(const char *date, time_t *output)
/* 8 digits, no year, month or day yet. This is YYYYMMDD */
found = TRUE;
yearnum = val / 10000;
monnum = (val % 10000) / 100 - 1; /* month is 0 - 11 */
monnum = ((val % 10000) / 100) - 1; /* month is 0 - 11 */
mdaynum = val % 100;
}

2
lib/pop3.c
View file

@ -557,7 +557,7 @@ static CURLcode pop3_perform_apop(struct Curl_easy *data,
size_t i;
struct MD5_context *ctxt;
unsigned char digest[MD5_DIGEST_LEN];
char secret[2 * MD5_DIGEST_LEN + 1];
char secret[(2 * MD5_DIGEST_LEN) + 1];
if(!pop3c)
return CURLE_FAILED_INIT;

2
lib/smb.c
View file

@ -548,7 +548,7 @@ static CURLcode smb_recv_message(struct Curl_easy *data,
if(nbt_size >= msg_size + 1) {
/* Add the word count */
msg_size += 1 + ((unsigned char)buf[msg_size]) * sizeof(unsigned short);
msg_size += 1 + (((unsigned char)buf[msg_size]) * sizeof(unsigned short));
if(nbt_size >= msg_size + sizeof(unsigned short)) {
/* Add the byte count */
msg_size += sizeof(unsigned short) +

2
lib/urlapi.c
View file

@ -1877,7 +1877,7 @@ CURLUcode curl_url_set(CURLU *u, CURLUPart what,
{
const char *newp;
struct dynbuf enc;
curlx_dyn_init(&enc, nalloc * 3 + 1 + leadingslash);
curlx_dyn_init(&enc, (nalloc * 3) + 1 + leadingslash);
if(leadingslash && (part[0] != '/')) {
CURLcode result = curlx_dyn_addn(&enc, "/", 1);

6
lib/vauth/digest.c
View file

@ -341,9 +341,9 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data,
struct MD5_context *ctxt;
char *response = NULL;
unsigned char digest[MD5_DIGEST_LEN];
char HA1_hex[2 * MD5_DIGEST_LEN + 1];
char HA2_hex[2 * MD5_DIGEST_LEN + 1];
char resp_hash_hex[2 * MD5_DIGEST_LEN + 1];
char HA1_hex[(2 * MD5_DIGEST_LEN) + 1];
char HA2_hex[(2 * MD5_DIGEST_LEN) + 1];
char resp_hash_hex[(2 * MD5_DIGEST_LEN) + 1];
char nonce[64];
char realm[128];
char algorithm[64];

2
lib/vauth/ntlm.c
View file

@ -398,7 +398,7 @@ static void unicodecpy(unsigned char *dest, const char *src, size_t length)
size_t i;
for(i = 0; i < length; i++) {
dest[2 * i] = (unsigned char)src[i];
dest[2 * i + 1] = '\0';
dest[(2 * i) + 1] = '\0';
}
}

8
lib/vquic/curl_ngtcp2.c
View file

@ -391,8 +391,8 @@ static void pktx_update_time(struct Curl_easy *data,
const struct curltime *pnow = Curl_pgrs_now(data);
vquic_ctx_update_time(&ctx->q, pnow);
pktx->ts = (ngtcp2_tstamp)pnow->tv_sec * NGTCP2_SECONDS +
(ngtcp2_tstamp)pnow->tv_usec * NGTCP2_MICROSECONDS;
pktx->ts = ((ngtcp2_tstamp)pnow->tv_sec * NGTCP2_SECONDS) +
((ngtcp2_tstamp)pnow->tv_usec * NGTCP2_MICROSECONDS);
}
static void pktx_init(struct pkt_io_ctx *pktx,
@ -406,8 +406,8 @@ static void pktx_init(struct pkt_io_ctx *pktx,
pktx->data = data;
ngtcp2_path_storage_zero(&pktx->ps);
vquic_ctx_set_time(&ctx->q, pnow);
pktx->ts = (ngtcp2_tstamp)pnow->tv_sec * NGTCP2_SECONDS +
(ngtcp2_tstamp)pnow->tv_usec * NGTCP2_MICROSECONDS;
pktx->ts = ((ngtcp2_tstamp)pnow->tv_sec * NGTCP2_SECONDS) +
((ngtcp2_tstamp)pnow->tv_usec * NGTCP2_MICROSECONDS);
}
static int cb_h3_acked_req_body(nghttp3_conn *conn, int64_t stream_id,

5
lib/vtls/keylog.c
View file

@ -107,8 +107,9 @@ bool Curl_tls_keylog_write(const char *label,
const unsigned char *secret, size_t secretlen)
{
size_t pos, i;
unsigned char line[KEYLOG_LABEL_MAXLEN + 1 + 2 * CLIENT_RANDOM_SIZE + 1 +
2 * SECRET_MAXLEN + 1 + 1];
unsigned char line[KEYLOG_LABEL_MAXLEN + 1 +
(2 * CLIENT_RANDOM_SIZE) + 1 +
(2 * SECRET_MAXLEN) + 1 + 1];
if(!keylog_file_fp) {
return FALSE;

4
lib/vtls/mbedtls.c
View file

@ -173,8 +173,8 @@ static int mbedtls_bio_cf_read(void *bio, unsigned char *buf, size_t blen)
/* See:
* https://web.archive.org/web/20200921194007/tls.mbed.org/discussions/generic/howto-determine-exact-buffer-len-for-mbedtls_pk_write_pubkey_der
*/
#define RSA_PUB_DER_MAX_BYTES (38 + 2 * MBEDTLS_MPI_MAX_SIZE)
#define ECP_PUB_DER_MAX_BYTES (30 + 2 * MBEDTLS_ECP_MAX_BYTES)
#define RSA_PUB_DER_MAX_BYTES (38 + (2 * MBEDTLS_MPI_MAX_SIZE))
#define ECP_PUB_DER_MAX_BYTES (30 + (2 * MBEDTLS_ECP_MAX_BYTES))
#define PUB_DER_MAX_BYTES (RSA_PUB_DER_MAX_BYTES > ECP_PUB_DER_MAX_BYTES ? \
RSA_PUB_DER_MAX_BYTES : ECP_PUB_DER_MAX_BYTES)

4
lib/vtls/x509asn1.c
View file

@ -983,7 +983,7 @@ static int do_pubkey(struct Curl_easy *data, int certnum, const char *algo,
if(!certnum)
infof(data, " ECC Public Key (%zu bits)", len);
if(data->set.ssl.certinfo) {
char q[sizeof(len) * 8 / 3 + 1];
char q[(sizeof(len) * 8 / 3) + 1];
(void)curl_msnprintf(q, sizeof(q), "%zu", len);
if(ssl_push_certinfo(data, certnum, "ECC Public Key", q))
return 1;
@ -1018,7 +1018,7 @@ static int do_pubkey(struct Curl_easy *data, int certnum, const char *algo,
if(!certnum)
infof(data, " RSA Public Key (%zu bits)", len);
if(data->set.ssl.certinfo) {
char r[sizeof(len) * 8 / 3 + 1];
char r[(sizeof(len) * 8 / 3) + 1];
curl_msnprintf(r, sizeof(r), "%zu", len);
if(ssl_push_certinfo(data, certnum, "RSA Public Key", r))
return 1;