luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup: added space around ternary expressions

Browse Source 
Closes #14990
This commit is contained in:
Gabriel Marin 2024-09-23 00:32:44 +03:00 committed by Daniel Stenberg
parent b7c9166c4c
commit b70e8f4b9b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ftp.c
View File

@ -1471,7 +1471,7 @@ static CURLcode ftp_state_prepare_transfer(struct Curl_easy *data)
struct ftp_conn *ftpc = &conn->proto.ftpc;
if(!conn->proto.ftpc.file)
result = Curl_pp_sendf(data, &ftpc->pp, "PRET %s",
data->set.str[STRING_CUSTOMREQUEST]?
data->set.str[STRING_CUSTOMREQUEST] ?
data->set.str[STRING_CUSTOMREQUEST] :
(data->state.list_only ? "NLST" : "LIST"));
else if(data->state.upload)
@ -1578,7 +1578,7 @@ static CURLcode ftp_state_list(struct Curl_easy *data)
}
cmd = aprintf("%s%s%s",
data->set.str[STRING_CUSTOMREQUEST]?
data->set.str[STRING_CUSTOMREQUEST] ?
data->set.str[STRING_CUSTOMREQUEST] :
(data->state.list_only ? "NLST" : "LIST"),
lstArg ? " " : "",

2
lib/http.c
View File

@ -1837,7 +1837,7 @@ CURLcode Curl_http_target(struct Curl_easy *data,
curl_url_cleanup(h);
/* target or URL */
result = Curl_dyn_add(r, data->set.str[STRING_TARGET]?
result = Curl_dyn_add(r, data->set.str[STRING_TARGET] ?
data->set.str[STRING_TARGET] : url);
free(url);
if(result)

2
lib/mprintf.c
View File

@ -984,7 +984,7 @@ number:
*fptr++ = 'l';
if(flags & FLAGS_FLOATE)
*fptr++ = (char)((flags & FLAGS_UPPER) ? 'E':'e');
*fptr++ = (char)((flags & FLAGS_UPPER) ? 'E' : 'e');
else if(flags & FLAGS_FLOATG)
*fptr++ = (char)((flags & FLAGS_UPPER) ? 'G' : 'g');
else

12
packages/OS400/ccsidcurl.c
View File

@ -127,8 +127,8 @@ convert(char *d, size_t dlen, int dccsid,
dccsid = ASCII_CCSID;
if(sccsid == dccsid) {
lslen = slen >= 0 ? slen: strlen(s) + 1;
i = lslen < dlen ? lslen: dlen;
lslen = slen >= 0 ? slen : strlen(s) + 1;
i = lslen < dlen ? lslen : dlen;
if(s != d && i > 0)
memcpy(d, s, i);
@ -170,7 +170,7 @@ static char *dynconvert(int dccsid, const char *s, int slen, int sccsid)
/* Like convert, but the destination is allocated and returned. */
dlen = (size_t) (slen < 0 ? strlen(s): slen) + 1;
dlen = (size_t) (slen < 0 ? strlen(s) : slen) + 1;
dlen *= MAX_CONV_EXPANSION; /* Allow some expansion. */
d = malloc(dlen);
@ -294,7 +294,7 @@ curl_easy_escape_ccsid(CURL *handle, const char *string, int length,
return (char *) NULL;
}
s = dynconvert(ASCII_CCSID, string, length ? length: -1, sccsid);
s = dynconvert(ASCII_CCSID, string, length ? length : -1, sccsid);
if(!s)
return (char *) NULL;
@ -324,7 +324,7 @@ curl_easy_unescape_ccsid(CURL *handle, const char *string, int length,
return (char *) NULL;
}
s = dynconvert(ASCII_CCSID, string, length ? length: -1, sccsid);
s = dynconvert(ASCII_CCSID, string, length ? length : -1, sccsid);
if(!s)
return (char *) NULL;
@ -1046,7 +1046,7 @@ Curl_formget_callback_ccsid(void *arg, const char *buf, size_t len)
ret = (*p->append)(p->arg, b, l);
free(b);
return ret == l ? len: -1;
return ret == l ? len : -1;
}

4
packages/OS400/os400sys.c
View File

@ -640,8 +640,8 @@ Curl_ldap_search_s_a(void *ld, char *base, int scope, char *filter,
}
if(status == LDAP_SUCCESS)
status = ldap_search_s(ld, ebase ? ebase: "", scope,
efilter ? efilter: "(objectclass=*)",
status = ldap_search_s(ld, ebase ? ebase : "", scope,
efilter ? efilter : "(objectclass=*)",
eattrs, attrsonly, res);
if(eattrs) {

6
tests/libtest/lib1156.c
View File

@ -90,16 +90,16 @@ static int onetest(CURL *curl, const char *url, const struct testparams *p,
unsigned int replyselector;
char urlbuf[256];
replyselector = (p->flags & F_CONTENTRANGE) ? 1: 0;
replyselector = (p->flags & F_CONTENTRANGE) ? 1 : 0;
if(p->flags & F_HTTP416)
replyselector += 2;
msnprintf(urlbuf, sizeof(urlbuf), "%s%04u", url, replyselector);
test_setopt(curl, CURLOPT_URL, urlbuf);
test_setopt(curl, CURLOPT_VERBOSE, 1L);
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) ?
"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;
res = curl_easy_perform(curl);
if(res != p->result) {

2
tests/libtest/lib670.c
View File

@ -56,7 +56,7 @@ static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp)
return CURL_READFUNC_PAUSE;
case 2:
delta = time(NULL) - pooh->origin;
*ptr = delta >= PAUSE_TIME ? '\x42': '\x41'; /* ASCII A or B. */
*ptr = delta >= PAUSE_TIME ? '\x42' : '\x41'; /* ASCII A or B. */
return 1;
case 3:
return 0;

2
tests/server/sws.c
View File

@ -1021,7 +1021,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
char responsedump[256];
msnprintf(responsedump, sizeof(responsedump), "%s/%s",
logdir, is_proxy ? RESPONSE_PROXY_DUMP:RESPONSE_DUMP);
logdir, is_proxy ? RESPONSE_PROXY_DUMP : RESPONSE_DUMP);
switch(req->rcmd) {
default: