mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-21 01:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: fix "clarify calculation precedence" warnings

Browse Source 
Codacy/CppCheck warns about this. Consistently use parentheses as we
already do in some places to silence the warning.

Closes https://github.com/curl/curl/pull/3866
This commit is contained in:
Marcel Raad 2019-05-11 14:51:24 +02:00
parent 5f8b9fe81d
commit 6b3dde7fe6
No known key found for this signature in database
GPG Key ID: FE4D8BC5EE1701DD
7 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/asyn-ares.c
View File

@ -331,9 +331,9 @@ static int waitperform(struct connectdata *conn, int timeout_ms)
/* move through the descriptors and ask for processing on them */ /* move through the descriptors and ask for processing on them */
for(i = 0; i < num; i++) for(i = 0; i < num; i++)
ares_process_fd((ares_channel)data->state.resolver, ares_process_fd((ares_channel)data->state.resolver,
pfd[i].revents & (POLLRDNORM|POLLIN)? (pfd[i].revents & (POLLRDNORM|POLLIN))?
pfd[i].fd:ARES_SOCKET_BAD, pfd[i].fd:ARES_SOCKET_BAD,
pfd[i].revents & (POLLWRNORM|POLLOUT)? (pfd[i].revents & (POLLWRNORM|POLLOUT))?
pfd[i].fd:ARES_SOCKET_BAD); pfd[i].fd:ARES_SOCKET_BAD);
} }
return nfds; return nfds;

4
lib/easy.c
View File

@ -451,8 +451,8 @@ static int events_socket(struct Curl_easy *easy, /* easy handle */
m->socket.revents = 0; m->socket.revents = 0;
ev->list = m; ev->list = m;
infof(easy, "socket cb: socket %d ADDED as %s%s\n", s, infof(easy, "socket cb: socket %d ADDED as %s%s\n", s,
what&CURL_POLL_IN?"IN":"", (what&CURL_POLL_IN)?"IN":"",
what&CURL_POLL_OUT?"OUT":""); (what&CURL_POLL_OUT)?"OUT":"");
} }
else else
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;

2
lib/formdata.c
View File

@ -569,7 +569,7 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
if(((form->flags & HTTPPOST_FILENAME) || if(((form->flags & HTTPPOST_FILENAME) ||
(form->flags & HTTPPOST_BUFFER)) && (form->flags & HTTPPOST_BUFFER)) &&
!form->contenttype) { !form->contenttype) {
char *f = form->flags & HTTPPOST_BUFFER? char *f = (form->flags & HTTPPOST_BUFFER)?
form->showfilename : form->value; form->showfilename : form->value;
char const *type; char const *type;
type = Curl_mime_contenttype(f); type = Curl_mime_contenttype(f);

6
lib/mime.c
View File

@ -821,8 +821,10 @@ static size_t readback_part(curl_mimepart *part,
struct curl_slist *hdr = (struct curl_slist *) part->state.ptr; struct curl_slist *hdr = (struct curl_slist *) part->state.ptr;
switch(part->state.state) { switch(part->state.state) {
case MIMESTATE_BEGIN: case MIMESTATE_BEGIN:
mimesetstate(&part->state, part->flags & MIME_BODY_ONLY? MIMESTATE_BODY: mimesetstate(&part->state,
MIMESTATE_CURLHEADERS, part->curlheaders); (part->flags & MIME_BODY_ONLY)?
MIMESTATE_BODY: MIMESTATE_CURLHEADERS,
part->curlheaders);
break; break;
case MIMESTATE_USERHEADERS: case MIMESTATE_USERHEADERS:
if(!hdr) { if(!hdr) {

4
lib/multi.c
View File

@ -3056,8 +3056,8 @@ void Curl_multi_dump(struct Curl_multi *multi)
continue; continue;
} }
fprintf(stderr, "[%s %s] ", fprintf(stderr, "[%s %s] ",
entry->action&CURL_POLL_IN?"RECVING":"", (entry->action&CURL_POLL_IN)?"RECVING":"",
entry->action&CURL_POLL_OUT?"SENDING":""); (entry->action&CURL_POLL_OUT)?"SENDING":"");
} }
if(data->numsocks) if(data->numsocks)
fprintf(stderr, "\n"); fprintf(stderr, "\n");

4
lib/progress.c
View File

@ -564,9 +564,9 @@ int Curl_pgrsUpdate(struct connectdata *conn)
/* Get the total amount of data expected to get transferred */ /* Get the total amount of data expected to get transferred */
total_expected_transfer = total_expected_transfer =
(data->progress.flags & PGRS_UL_SIZE_KNOWN? ((data->progress.flags & PGRS_UL_SIZE_KNOWN)?
data->progress.size_ul:data->progress.uploaded)+ data->progress.size_ul:data->progress.uploaded)+
(data->progress.flags & PGRS_DL_SIZE_KNOWN? ((data->progress.flags & PGRS_DL_SIZE_KNOWN)?
data->progress.size_dl:data->progress.downloaded); data->progress.size_dl:data->progress.downloaded);
/* We have transferred this much so far */ /* We have transferred this much so far */

4
tests/libtest/lib1156.c
View File

@ -88,7 +88,7 @@ static int onetest(CURL *curl, const char *url, const testparams *p)
unsigned int replyselector; unsigned int replyselector;
char urlbuf[256]; char urlbuf[256];
replyselector = p->flags & F_CONTENTRANGE? 1: 0; replyselector = (p->flags & F_CONTENTRANGE)? 1: 0;
if(p->flags & F_HTTP416) if(p->flags & F_HTTP416)
replyselector += 2; replyselector += 2;
msnprintf(urlbuf, sizeof(urlbuf), "%s%04u", url, replyselector); msnprintf(urlbuf, sizeof(urlbuf), "%s%04u", url, replyselector);
@ -96,7 +96,7 @@ static int onetest(CURL *curl, const char *url, const testparams *p)
test_setopt(curl, CURLOPT_RESUME_FROM, (p->flags & F_RESUME)? 3: 0); test_setopt(curl, CURLOPT_RESUME_FROM, (p->flags & F_RESUME)? 3: 0);
test_setopt(curl, CURLOPT_RANGE, !(p->flags & F_RESUME)? test_setopt(curl, CURLOPT_RANGE, !(p->flags & F_RESUME)?
"3-1000000": (char *) NULL); "3-1000000": (char *) NULL);
test_setopt(curl, CURLOPT_FAILONERROR, p->flags & F_FAIL? 1: 0); test_setopt(curl, CURLOPT_FAILONERROR, (p->flags & F_FAIL)? 1: 0);
hasbody = 0; hasbody = 0;
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
if(res != p->result) { if(res != p->result) {