cleanup: insert newline after if() conditions

Our code style mandates we put the conditional block on a separate
line. These mistakes are now detected by the updated checksrc.

diff --git a/lib/if2ip.c b/lib/if2ip.c
index d003de6783ef98783898aa41ec32e8280a2fac3e..b283f67f8b423e6ef9f6038c25d14bf1b4006688 100644 (file)
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -129,11 +129,11 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
               unsigned int ifscope = Curl_ipv6_scope(iface->ifa_addr);
 
               if(ifscope != remote_scope) {
-                /* We are interested only in interface addresses whose
-                   scope matches the remote address we want to
-                   connect to: global for global, link-local for
-                   link-local, etc... */
-                if(res == IF2IP_NOT_FOUND) res = IF2IP_AF_NOT_SUPPORTED;
+                /* We are interested only in interface addresses whose scope
+                   matches the remote address we want to connect to: global
+                   for global, link-local for link-local, etc... */
+                if(res == IF2IP_NOT_FOUND)
+                  res = IF2IP_AF_NOT_SUPPORTED;
                 continue;
               }
 

diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 97ee7183e0982e38a630f82a711ea26aa4958b6b..7f66675fc670e57eee95475130cea1d02cfd7bff 100644 (file)
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -227,7 +227,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
 
     gss_release_buffer(&gss_status, &gss_send_token);
     gss_release_buffer(&gss_status, &gss_recv_token);
-    if(gss_major_status != GSS_S_CONTINUE_NEEDED) break;
+    if(gss_major_status != GSS_S_CONTINUE_NEEDED)
+      break;
 
     /* analyse response */
 

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 14bfe35621596774303b315fb9ab0f9f8c556045..176fa522a5e3df267d5f4229765c003a75d7fc6e 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1824,7 +1824,8 @@ static CURLcode verifystatus(struct connectdata *conn,
   }
 
 end:
-  if(br) OCSP_BASICRESP_free(br);
+  if(br)
+    OCSP_BASICRESP_free(br);
   OCSP_RESPONSE_free(rsp);
 
   return result;

diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index f3b7a9c8323fb5fc90a88b792484ff25369b117e..f244ba49042af65a842739793880762f835030d8 100644 (file)
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -285,7 +285,8 @@ CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *config,
     /* we only use this for real if --libcurl was used */
     const NameValue *nv = NULL;
     for(nv = nvlist; nv->name; nv++) {
-      if(nv->value == lval) break; /* found it */
+      if(nv->value == lval)
+        break; /* found it */
     }
     if(! nv->name) {
       /* If no definition was found, output an explicit value.

diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index 393743962beffb0f3ed38111902adf046c126965..4f2af415a89ad09160ce2d05664cdf3ae2d783b8 100644 (file)
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -44,11 +44,13 @@
 
 #include "curl_printf.h"
 
-#define test_setopt(A,B,C) \
-  if((res = curl_easy_setopt((A), (B), (C))) != CURLE_OK) goto test_cleanup
+#define test_setopt(A,B,C)                                      \
+  if((res = curl_easy_setopt((A), (B), (C))) != CURLE_OK)       \
+    goto test_cleanup
 
-#define test_multi_setopt(A,B,C) \
-  if((res = curl_multi_setopt((A), (B), (C))) != CURLE_OK) goto test_cleanup
+#define test_multi_setopt(A,B,C)                                \
+  if((res = curl_multi_setopt((A), (B), (C))) != CURLE_OK)      \
+    goto test_cleanup
 
 extern char *libtest_arg2; /* set by first.c to the argv[2] or NULL */
 extern char *libtest_arg3; /* set by first.c to the argv[3] or NULL */

diff --git a/tests/unit/unit1394.c b/tests/unit/unit1394.c
index 6855fc7abd6c35a8ace06abfcd04a03f8e7ec3ac..d6644f8eb4cd2378b2f9e1e38266ed928a2b4f90 100644 (file)
--- a/tests/unit/unit1394.c
+++ b/tests/unit/unit1394.c
@@ -122,8 +122,10 @@ UNITTEST_START
         fail("assertion failure");
       }
     }
-    if(certname) free(certname);
-    if(passphrase) free(passphrase);
+    if(certname)
+      free(certname);
+    if(passphrase)
+      free(passphrase);
   }
 
 UNITTEST_STOP