tidy-up: drop parenthesis around `return` expression

Closes #15990

diff --git a/docs/examples/cacertinmem.c b/docs/examples/cacertinmem.c
index b095b4616667f0d6e11e2ae2742e2df0d0826cee..d95f0ef21a977fa32f6f2c825170ae80ab6ed861 100644 (file)
--- a/docs/examples/cacertinmem.c
+++ b/docs/examples/cacertinmem.c
@@ -34,7 +34,7 @@
 static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
 {
   fwrite(ptr, size, nmemb, (FILE *)stream);
-  return (nmemb*size);
+  return nmemb * size;
 }
 
 static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm)

diff --git a/docs/examples/synctime.c b/docs/examples/synctime.c
index 7683e9bf80f6c703af762e922dd40e7cbb99a501..109ae0361b54a9495ea850396423655be2413d67 100644 (file)
--- a/docs/examples/synctime.c
+++ b/docs/examples/synctime.c
@@ -119,7 +119,7 @@ static size_t SyncTime_CURL_WriteOutput(void *ptr, size_t size, size_t nmemb,
                                         void *stream)
 {
   fwrite(ptr, size, nmemb, stream);
-  return (nmemb*size);
+  return nmemb * size;
 }
 
 static size_t SyncTime_CURL_WriteHeader(void *ptr, size_t size, size_t nmemb,
@@ -171,7 +171,7 @@ static size_t SyncTime_CURL_WriteHeader(void *ptr, size_t size, size_t nmemb,
             " Server Date is no longer valid.\n");
     AutoSyncTime = 0;
   }
-  return (nmemb*size);
+  return nmemb * size;
 }
 
 static void SyncTime_CURL_Init(CURL *curl, const char *proxy_port,

diff --git a/docs/examples/usercertinmem.c b/docs/examples/usercertinmem.c
index 02c53c82c6c068be198b25abe174843c3e96faff..e8c78fe79e0b318519b547dbd4b277d8292ebf08 100644 (file)
--- a/docs/examples/usercertinmem.c
+++ b/docs/examples/usercertinmem.c
@@ -44,7 +44,7 @@
 static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
 {
   fwrite(ptr, size, nmemb, stream);
-  return (nmemb*size);
+  return nmemb * size;
 }
 
 static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm)

diff --git a/lib/cf-h1-proxy.c b/lib/cf-h1-proxy.c
index 943b10cfdbc9fa29efa230892ba928923b7f2e85..2e13f3929543f842259cf8ce225a0eae273af4c3 100644 (file)
--- a/lib/cf-h1-proxy.c
+++ b/lib/cf-h1-proxy.c
@@ -203,7 +203,7 @@ static void tunnel_free(struct Curl_cfilter *cf,
 
 static bool tunnel_want_send(struct h1_tunnel_state *ts)
 {
-  return (ts->tunnel_state == H1_TUNNEL_CONNECT);
+  return ts->tunnel_state == H1_TUNNEL_CONNECT;
 }
 
 static CURLcode start_CONNECT(struct Curl_cfilter *cf,

diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index f8dbf416cd9fa33a9fd0716b2354ee03ac31c992..cbbe80fd1ca6bf4d06db4ff8acf24bb51146289a 100644 (file)
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -1459,7 +1459,7 @@ static bool cf_socket_data_pending(struct Curl_cfilter *cf,
 
   (void)data;
   readable = SOCKET_READABLE(ctx->sock, 0);
-  return (readable > 0 && (readable & CURL_CSELECT_IN));
+  return readable > 0 && (readable & CURL_CSELECT_IN);
 }
 
 #ifdef USE_WINSOCK

diff --git a/lib/cookie.c b/lib/cookie.c
index 48a200dc6daff07326d534708bc5d24f6c5a2e78..6fe949b56f8e0a7d8552eaa90a5edf904bb4e1b7 100644 (file)
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -469,7 +469,7 @@ static bool invalid_octets(const char *p)
   size_t len;
   /* scan for all the octets that are *not* in cookie-octet */
   len = strcspn(p, badoctets);
-  return (p[len] != '\0');
+  return p[len] != '\0';
 }
 
 #define CERR_OK            0
@@ -1335,14 +1335,14 @@ static int cookie_sort(const void *p1, const void *p2)
   l2 = c2->path ? strlen(c2->path) : 0;
 
   if(l1 != l2)
-    return (l2 > l1) ? 1 : -1 ; /* avoid size_t <=> int conversions */
+    return (l2 > l1) ? 1 : -1; /* avoid size_t <=> int conversions */
 
   /* 2 - compare cookie domain lengths */
   l1 = c1->domain ? strlen(c1->domain) : 0;
   l2 = c2->domain ? strlen(c2->domain) : 0;
 
   if(l1 != l2)
-    return (l2 > l1) ? 1 : -1 ;  /* avoid size_t <=> int conversions */
+    return (l2 > l1) ? 1 : -1; /* avoid size_t <=> int conversions */
 
   /* 3 - compare cookie name lengths */
   l1 = c1->name ? strlen(c1->name) : 0;

diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c
index 9102c972bcbd2c5deb4224aa42322238ec8248ef..220b2fa3f620f56d1e97c82d5250d6f4d5e9954e 100644 (file)
--- a/lib/curl_multibyte.c
+++ b/lib/curl_multibyte.c
@@ -237,7 +237,7 @@ cleanup:
   free(ibuf);
   free(obuf);
 #endif
-  return (*out ? true : false);
+  return *out ? true : false;
 }
 
 int curlx_win32_open(const char *filename, int oflag, ...)

diff --git a/lib/easyoptions.c b/lib/easyoptions.c
index 81091c405aaa5a6f4ae30ba72e091f3a1d59a3d7..f2ced2cb5083ec6d633745ef99d30e9242283cd2 100644 (file)
--- a/lib/easyoptions.c
+++ b/lib/easyoptions.c
@@ -377,6 +377,6 @@ struct curl_easyoption Curl_easyopts[] = {
  */
 int Curl_easyopts_check(void)
 {
-  return ((CURLOPT_LASTENTRY%10000) != (326 + 1));
+  return (CURLOPT_LASTENTRY % 10000) != (326 + 1);
 }
 #endif

diff --git a/lib/hostip.c b/lib/hostip.c
index 509b9d48671506b4d4705556739f35c3c0e48a1d..110595c9e6e30f4d60c536cb5e7c3fec80c32d9f 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -632,7 +632,7 @@ bool Curl_ipv6works(struct Curl_easy *data)
       ipv6_works = 1;
       sclose(s);
     }
-    return (ipv6_works > 0);
+    return ipv6_works > 0;
   }
 }
 #endif /* USE_IPV6 */

diff --git a/lib/http.c b/lib/http.c
index fc06a6f561d9d57d14d9834c05df08dba284e013..59ee15b7f6b7e585c05ffa13cd5294b99cc38dca 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -1234,8 +1234,8 @@ static bool use_http_1_1plus(const struct Curl_easy *data,
   if((data->state.httpwant == CURL_HTTP_VERSION_1_0) &&
      (conn->httpversion <= 10))
     return FALSE;
-  return ((data->state.httpwant == CURL_HTTP_VERSION_NONE) ||
-          (data->state.httpwant >= CURL_HTTP_VERSION_1_1));
+  return (data->state.httpwant == CURL_HTTP_VERSION_NONE) ||
+         (data->state.httpwant >= CURL_HTTP_VERSION_1_1);
 }
 
 static const char *get_http_string(const struct Curl_easy *data,
@@ -4379,7 +4379,7 @@ static bool http_exp100_is_waiting(struct Curl_easy *data)
   struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100);
   if(r) {
     struct cr_exp100_ctx *ctx = r->ctx;
-    return (ctx->state == EXP100_AWAITING_CONTINUE);
+    return ctx->state == EXP100_AWAITING_CONTINUE;
   }
   return FALSE;
 }

diff --git a/lib/http2.c b/lib/http2.c
index 2e8708c4530c78f54faf6a5ea2bbfe2827220e47..87df2a9249cb2bd211affe5ab2f98dc3bedc7246 100644 (file)
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -2955,7 +2955,7 @@ bool Curl_h2_http_1_1_error(struct Curl_easy *data)
 {
   if(Curl_conn_is_http2(data, data->conn, FIRSTSOCKET)) {
     int err = Curl_conn_get_stream_error(data, data->conn, FIRSTSOCKET);
-    return (err == NGHTTP2_HTTP_1_1_REQUIRED);
+    return err == NGHTTP2_HTTP_1_1_REQUIRED;
   }
   return FALSE;
 }

diff --git a/lib/ldap.c b/lib/ldap.c
index ff44e79a110bf7d7558e475a0cdd756a06d24a0a..97484a2b4d1e56410ee79b3a626d81176243c5db 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -805,7 +805,7 @@ static int str2scope(const char *p)
     return LDAP_SCOPE_SUBTREE;
   if(strcasecompare(p, "subtree"))
     return LDAP_SCOPE_SUBTREE;
-  return (-1);
+  return -1;
 }
 
 /*

diff --git a/lib/memdebug.c b/lib/memdebug.c
index 02612c2a23f17910fb651da143bfc21f497513ed..9c284ede518f09bae569eca01b630f1c15134295 100644 (file)
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -153,7 +153,7 @@ ALLOC_FUNC void *curl_dbg_malloc(size_t wantedsize,
                  source, line, wantedsize,
                  mem ? (void *)mem->mem : (void *)0);
 
-  return (mem ? mem->mem : NULL);
+  return mem ? mem->mem : NULL;
 }
 
 ALLOC_FUNC void *curl_dbg_calloc(size_t wanted_elements, size_t wanted_size,
@@ -181,7 +181,7 @@ ALLOC_FUNC void *curl_dbg_calloc(size_t wanted_elements, size_t wanted_size,
                  source, line, wanted_elements, wanted_size,
                  mem ? (void *)mem->mem : (void *)0);
 
-  return (mem ? mem->mem : NULL);
+  return mem ? mem->mem : NULL;
 }
 
 ALLOC_FUNC char *curl_dbg_strdup(const char *str,

diff --git a/lib/mime.c b/lib/mime.c
index cc93e078511139ed2db18a234c6d104481b1676d..d4488913dd383fc88957a2175971f1f7c2519da0 100644 (file)
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -2179,7 +2179,7 @@ static bool cr_mime_is_paused(struct Curl_easy *data,
 {
   struct cr_mime_ctx *ctx = reader->ctx;
   (void)data;
-  return (ctx->part && ctx->part->lastreadstatus == CURL_READFUNC_PAUSE);
+  return ctx->part && ctx->part->lastreadstatus == CURL_READFUNC_PAUSE;
 }
 
 static const struct Curl_crtype cr_mime = {

diff --git a/lib/multi.c b/lib/multi.c
index 6fcb4a099ea5ca9331f65889121f7c0c26c3e69f..bb9ccd03f9915792f3114916b721b4441caf411e 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -933,7 +933,7 @@ CURLMcode curl_multi_remove_handle(CURLM *m, CURL *d)
 /* Return TRUE if the application asked for multiplexing */
 bool Curl_multiplex_wanted(const struct Curl_multi *multi)
 {
-  return (multi && (multi->multiplexing));
+  return multi && multi->multiplexing;
 }
 
 /*
@@ -4150,7 +4150,7 @@ void Curl_set_in_callback(struct Curl_easy *data, bool value)
 
 bool Curl_is_in_callback(struct Curl_easy *data)
 {
-  return (data && data->multi && data->multi->in_callback);
+  return data && data->multi && data->multi->in_callback;
 }
 
 unsigned int Curl_multi_max_concurrent_streams(struct Curl_multi *multi)

diff --git a/lib/noproxy.c b/lib/noproxy.c
index dbfafc93eb8172d250405148944efd0aeb25c323..78cc06fa019f6c0f6c51690d173397d66ffbb677 100644 (file)
--- a/lib/noproxy.c
+++ b/lib/noproxy.c
@@ -71,7 +71,7 @@ UNITTEST bool Curl_cidr4_match(const char *ipv4,    /* 1.2.3.4 address */
       return FALSE;
     return TRUE;
   }
-  return (address == check);
+  return address == check;
 }
 
 UNITTEST bool Curl_cidr6_match(const char *ipv6,

diff --git a/lib/optiontable.pl b/lib/optiontable.pl
index 2727784e7bdd5dfbeb6ecd7bdf3a502c3da451b0..350262c70f1b4d0a392e09a417b86c191fdc6893 100755 (executable)
--- a/lib/optiontable.pl
+++ b/lib/optiontable.pl
@@ -145,7 +145,7 @@ print <<FOOT
  */
 int Curl_easyopts_check(void)
 {
-  return ((CURLOPT_LASTENTRY%10000) != ($lastnum + 1));
+  return (CURLOPT_LASTENTRY % 10000) != ($lastnum + 1);
 }
 #endif
 FOOT

diff --git a/lib/pingpong.c b/lib/pingpong.c
index bd0d3e3a2a440da1ca2f0d49d70722486f836bb0..bae6dd273fb4ee4ee29774c8a57be61aa486bc3d 100644 (file)
--- a/lib/pingpong.c
+++ b/lib/pingpong.c
@@ -448,7 +448,7 @@ CURLcode Curl_pp_disconnect(struct pingpong *pp)
 
 bool Curl_pp_moredata(struct pingpong *pp)
 {
-  return (!pp->sendleft && Curl_dyn_len(&pp->recvbuf) > pp->nfinal);
+  return !pp->sendleft && Curl_dyn_len(&pp->recvbuf) > pp->nfinal;
 }
 
 #endif

diff --git a/lib/progress.c b/lib/progress.c
index 91fae30fdf7707845456ab9e0c4d266b7d2b25ba..82cbeb3770fddb954320d8229ec4fd0775ec59e9 100644 (file)
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -312,7 +312,7 @@ timediff_t Curl_pgrsLimitWaitTime(struct pgrs_dir *d,
   if(actual < minimum) {
     /* if it downloaded the data faster than the limit, make it wait the
        difference */
-    return (minimum - actual);
+    return minimum - actual;
   }
 
   return 0;

diff --git a/lib/strcase.c b/lib/strcase.c
index b22dd31fc862296af4919115edac0194d075c440..112aedb1930059e7748df7e5cd277c0d8bac9d78 100644 (file)
--- a/lib/strcase.c
+++ b/lib/strcase.c
@@ -113,7 +113,7 @@ int curl_strequal(const char *first, const char *second)
     return casecompare(first, second);
 
   /* if both pointers are NULL then treat them as equal */
-  return (NULL == first && NULL == second);
+  return NULL == first && NULL == second;
 }
 
 static int ncasecompare(const char *first, const char *second, size_t max)
@@ -139,7 +139,7 @@ int curl_strnequal(const char *first, const char *second, size_t max)
     return ncasecompare(first, second, max);
 
   /* if both pointers are NULL then treat them as equal if max is non-zero */
-  return (NULL == first && NULL == second && max);
+  return NULL == first && NULL == second && max;
 }
 /* Copy an upper case version of the string from src to dest. The
  * strings may overlap. No more than n characters of the string are copied

diff --git a/lib/strerror.c b/lib/strerror.c
index 32449c9fa1b4568ecfba63ae101360fe9e5a0593..20495c9791a17a8784a7186ad3de85979fc1d813 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -808,7 +808,7 @@ get_winapi_error(int err, char *buf, size_t buflen)
       *p = '\0';
   }
 
-  return (*buf ? buf : NULL);
+  return *buf ? buf : NULL;
 }
 #endif /* _WIN32 || _WIN32_WCE */
 

diff --git a/lib/transfer.c b/lib/transfer.c
index 0407613f08bb4fd90f2aad45e75f56fdca0aaeaa..4e0454fe8364451311d75b953d506d17d015f79e 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -973,9 +973,9 @@ bool Curl_xfer_is_blocked(struct Curl_easy *data)
   bool want_send = ((data)->req.keepon & KEEP_SEND);
   bool want_recv = ((data)->req.keepon & KEEP_RECV);
   if(!want_send)
-    return (want_recv && Curl_cwriter_is_paused(data));
+    return want_recv && Curl_cwriter_is_paused(data);
   else if(!want_recv)
-    return (want_send && Curl_creader_is_paused(data));
+    return want_send && Curl_creader_is_paused(data);
   else
     return Curl_creader_is_paused(data) && Curl_cwriter_is_paused(data);
 }

diff --git a/lib/url.c b/lib/url.c
index 001989d186d037b4e1c57d8996ef4d50852ef331..843f504a1a0e90811077164f33a5a4e46328d122 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -837,8 +837,8 @@ CURLcode Curl_conn_upkeep(struct Curl_easy *data,
 static bool ssh_config_matches(struct connectdata *one,
                                struct connectdata *two)
 {
-  return (Curl_safecmp(one->proto.sshc.rsa, two->proto.sshc.rsa) &&
-          Curl_safecmp(one->proto.sshc.rsa_pub, two->proto.sshc.rsa_pub));
+  return Curl_safecmp(one->proto.sshc.rsa, two->proto.sshc.rsa) &&
+         Curl_safecmp(one->proto.sshc.rsa_pub, two->proto.sshc.rsa_pub);
 }
 #else
 #define ssh_config_matches(x,y) FALSE

diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index 2ae6fb30c93c110314af284a33de3a26002d6e91..c06ee1064f47517e234b7bc0fb7ad0482da20910 100644 (file)
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -69,7 +69,7 @@ bool Curl_auth_is_digest_supported(void)
     Curl_pSecFn->FreeContextBuffer(SecurityPackage);
   }
 
-  return (status == SEC_E_OK);
+  return status == SEC_E_OK;
 }
 
 /*

diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index 4af0bd1e134d86ba532d892169d213083cb0a08c..00a5db125d072aacd16415ff5eeddfefe7bf9e6d 100644 (file)
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -64,7 +64,7 @@ bool Curl_auth_is_gssapi_supported(void)
     Curl_pSecFn->FreeContextBuffer(SecurityPackage);
   }
 
-  return (status == SEC_E_OK);
+  return status == SEC_E_OK;
 }
 
 /*

diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index a2e5bc102696beab6fdc408fb25020adccd0bb3e..6421c6ac1b44298a2b5749272597f9811ae071dc 100644 (file)
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -63,7 +63,7 @@ bool Curl_auth_is_ntlm_supported(void)
     Curl_pSecFn->FreeContextBuffer(SecurityPackage);
   }
 
-  return (status == SEC_E_OK);
+  return status == SEC_E_OK;
 }
 
 /*

diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index 7a27c298fc11a9d33c945ca3c86ad58354494bd4..2439e7319f5efdfbca8a96e50c1c1a1b57ab8698 100644 (file)
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -67,7 +67,7 @@ bool Curl_auth_is_spnego_supported(void)
   }
 
 
-  return (status == SEC_E_OK);
+  return status == SEC_E_OK;
 }
 
 /*

diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c
index a7e7e17f3b236d77b487138d094dbf9186d2f608..171e53fb13e0039e2b3cd74be60e2c4bf232418e 100644 (file)
--- a/lib/vauth/vauth.c
+++ b/lib/vauth/vauth.c
@@ -153,10 +153,10 @@ bool Curl_auth_user_contains_domain(const char *user)
 bool Curl_auth_allowed_to_host(struct Curl_easy *data)
 {
   struct connectdata *conn = data->conn;
-  return (!data->state.this_is_a_follow ||
-          data->set.allow_auth_to_other_hosts ||
-          (data->state.first_host &&
-           strcasecompare(data->state.first_host, conn->host.name) &&
-           (data->state.first_remote_port == conn->remote_port) &&
-           (data->state.first_remote_protocol == conn->handler->protocol)));
+  return !data->state.this_is_a_follow ||
+         data->set.allow_auth_to_other_hosts ||
+         (data->state.first_host &&
+          strcasecompare(data->state.first_host, conn->host.name) &&
+          (data->state.first_remote_port == conn->remote_port) &&
+          (data->state.first_remote_protocol == conn->handler->protocol));
 }

diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c
index 09708915804cf96bfc772345a01f00343e897e90..bb06b76ab7909f135e331e9f5498f8da0332af80 100644 (file)
--- a/lib/vquic/vquic.c
+++ b/lib/vquic/vquic.c
@@ -708,8 +708,8 @@ bool Curl_conn_is_http3(const struct Curl_easy *data,
 #elif defined(USE_MSH3)
   return Curl_conn_is_msh3(data, conn, sockindex);
 #else
-  return ((conn->handler->protocol & PROTO_FAMILY_HTTP) &&
-          (conn->httpversion == 30));
+  return (conn->handler->protocol & PROTO_FAMILY_HTTP) &&
+         (conn->httpversion == 30);
 #endif
 }
 

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index be77eeb353c0d31214c4b9538c06b224a5eacff5..382ac244a9f69c302f06b43babc98931dcf2cdbb 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -746,7 +746,7 @@ static long ossl_bio_cf_ctrl(BIO *bio, int cmd, long num, void *ptr)
 #ifdef BIO_CTRL_EOF
   case BIO_CTRL_EOF:
     /* EOF has been reached on input? */
-    return (!cf->next || !cf->next->connected);
+    return !cf->next || !cf->next->connected;
 #endif
   default:
     ret = 0;
@@ -1020,7 +1020,7 @@ static int passwd_callback(char *buf, int num, int encrypting,
  */
 static bool rand_enough(void)
 {
-  return (0 != RAND_status());
+  return 0 != RAND_status();
 }
 
 static CURLcode ossl_seed(struct Curl_easy *data)
@@ -1076,8 +1076,8 @@ static CURLcode ossl_seed(struct Curl_easy *data)
   }
 
   infof(data, "libcurl is now using a weak random seed");
-  return (rand_enough() ? CURLE_OK :
-          CURLE_SSL_CONNECT_ERROR /* confusing error code */);
+  return rand_enough() ? CURLE_OK :
+         CURLE_SSL_CONNECT_ERROR; /* confusing error code */
 #endif
 }
 
@@ -1155,7 +1155,7 @@ static int ssl_ui_writer(UI *ui, UI_STRING *uis)
  */
 static bool is_pkcs11_uri(const char *string)
 {
-  return (string && strncasecompare(string, "pkcs11:", 7));
+  return string && strncasecompare(string, "pkcs11:", 7);
 }
 
 #endif
@@ -5454,7 +5454,7 @@ static CURLcode ossl_random(struct Curl_easy *data,
   }
   /* RAND_bytes() returns 1 on success, 0 otherwise.  */
   rc = RAND_bytes(entropy, (ossl_valsize_t)curlx_uztosi(length));
-  return (rc == 1 ? CURLE_OK : CURLE_FAILED_INIT);
+  return rc == 1 ? CURLE_OK : CURLE_FAILED_INIT;
 }
 
 #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256)

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index e8ce9b7df32efc2d7658275982e43aead5b4ec19..93348f05e26383abb09e8076694a37f36acee9fb 100644 (file)
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -2273,11 +2273,11 @@ static bool schannel_data_pending(struct Curl_cfilter *cf,
   DEBUGASSERT(backend);
 
   if(backend->ctxt) /* SSL/TLS is in use */
-    return (backend->decdata_offset > 0 ||
-            (backend->encdata_offset > 0 && !backend->encdata_is_incomplete) ||
-            backend->recv_connection_closed ||
-            backend->recv_sspi_close_notify ||
-            backend->recv_unrecoverable_err);
+    return backend->decdata_offset > 0 ||
+           (backend->encdata_offset > 0 && !backend->encdata_is_incomplete) ||
+           backend->recv_connection_closed ||
+           backend->recv_sspi_close_notify ||
+           backend->recv_unrecoverable_err;
   else
     return FALSE;
 }
@@ -2467,7 +2467,7 @@ static void schannel_close(struct Curl_cfilter *cf, struct Curl_easy *data)
 
 static int schannel_init(void)
 {
-  return (Curl_sspi_global_init() == CURLE_OK ? 1 : 0);
+  return Curl_sspi_global_init() == CURLE_OK ? 1 : 0;
 }
 
 static void schannel_cleanup(void)

diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index 467de62a197d8bb62831bb268bcc920020105677..82b21afb8c4f425e220ee47782e6cdb9f3bb36c0 100644 (file)
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -295,7 +295,7 @@ static long wolfssl_bio_cf_ctrl(WOLFSSL_BIO *bio, int cmd, long num, void *ptr)
 #ifdef WOLFSSL_BIO_CTRL_EOF
   case WOLFSSL_BIO_CTRL_EOF:
     /* EOF has been reached on input? */
-    return (!cf->next || !cf->next->connected);
+    return !cf->next || !cf->next->connected;
 #endif
   default:
     ret = 0;

diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index c7f79cebbdbb7f431d20a8e34e2c18e3bd7aa135..171b063b9fc200aebf3693b97d7d29ae1e367e56 100644 (file)
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -418,7 +418,7 @@ static SANITIZEcode msdosify(char **const sanitized, const char *file_name,
   }
 
   *sanitized = strdup(dos_name);
-  return (*sanitized ? SANITIZE_ERR_OK : SANITIZE_ERR_OUT_OF_MEMORY);
+  return *sanitized ? SANITIZE_ERR_OK : SANITIZE_ERR_OUT_OF_MEMORY;
 }
 #endif /* MSDOS */
 
@@ -547,7 +547,7 @@ static SANITIZEcode rename_if_reserved_dos(char **const sanitized,
 #endif
 
   *sanitized = strdup(fname);
-  return (*sanitized ? SANITIZE_ERR_OK : SANITIZE_ERR_OUT_OF_MEMORY);
+  return *sanitized ? SANITIZE_ERR_OK : SANITIZE_ERR_OUT_OF_MEMORY;
 }
 
 #ifdef __DJGPP__

diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
index 78d4e0adf88ab26d8631b302837f8f889950868d..06dc7a72541987e1fdf7b83946e5a43b017a5330 100644 (file)
--- a/src/tool_operhlp.c
+++ b/src/tool_operhlp.c
@@ -66,7 +66,7 @@ bool output_expected(const char *url, const char *uploadfile)
 
 bool stdin_upload(const char *uploadfile)
 {
-  return (!strcmp(uploadfile, "-") || !strcmp(uploadfile, "."));
+  return !strcmp(uploadfile, "-") || !strcmp(uploadfile, ".");
 }
 
 /* Convert a CURLUcode into a CURLcode */