cleanup: added space around ternary expressions

Closes #14990

diff --git a/lib/ftp.c b/lib/ftp.c
index 07ba3bddd899788921a30d3e691e2da8d62e425e..b1001a330985b563e90d6e1b85e56e6d12935c42 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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 ? " " : "",

diff --git a/lib/http.c b/lib/http.c
index ad04fe35407bbdd05a15b6f1a0d1ad506abdf4c6..0c8fdf15b459c92eeebaf221bd093354a2bb9933 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -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)

diff --git a/lib/mprintf.c b/lib/mprintf.c
index 7a9d2eae78122f66e33000ad6e3a2764b940c464..478b0b074e3ae1703cb2580edabc9fc719937012 100644 (file)
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -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

diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index aa49cd77a849b4a4c405e01bf1498f93edade33c..fe2b4589c542a684bdef49f52b9271002a5c9ad3 100644 (file)
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -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;
 }
 
 

diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 4678a3190f48e8243af79915f726137e1a83ad4d..07be5dcc514bbfc6e1cebeae56ad3523c2a4f476 100644 (file)
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -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) {

diff --git a/tests/libtest/lib1156.c b/tests/libtest/lib1156.c
index 8959db76388073f0deb159e7e711cc10456de7f9..6854e3bc445265b6200e12b4fe568cd1c0909dec 100644 (file)
--- a/tests/libtest/lib1156.c
+++ b/tests/libtest/lib1156.c
@@ -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) {

diff --git a/tests/libtest/lib670.c b/tests/libtest/lib670.c
index 4f797c583a20e86e2ffdfce146aef7363ae52159..e03e8abebf6c67f73baa9a7b3cb8acf9abb861b5 100644 (file)
--- a/tests/libtest/lib670.c
+++ b/tests/libtest/lib670.c
@@ -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;

diff --git a/tests/server/sws.c b/tests/server/sws.c
index 68c1bd4cd1615fbba1b9ec60f86b9aa6adabe42b..86fba1c4d9ddbe850b6a1d3210f333c9ab1a7b1c 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -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: