summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-03-30 10:55:31 +0200
committerDaniel Stenberg <daniel@haxx.se>2020-03-30 16:05:30 +0200
commit0e607542dca1247217997184224fc1a779778166 (patch)
tree104bc925f4d51abb088953cc35de96ee33e9e610
parent529add48bc2a8e66bdbc1926e7708535dd5317a2 (diff)
downloadcurl-0e607542dca1247217997184224fc1a779778166.tar.gz
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.
-rw-r--r--lib/if2ip.c12
-rw-r--r--lib/socks_gssapi.c3
-rw-r--r--lib/vtls/openssl.c3
-rw-r--r--src/tool_setopt.c3
-rw-r--r--tests/libtest/test.h12
-rw-r--r--tests/unit/unit1394.c6
6 files changed, 23 insertions, 16 deletions
diff --git a/lib/if2ip.c b/lib/if2ip.c
index d003de678..b283f67f8 100644
--- 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 97ee7183e..7f66675fc 100644
--- 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 14bfe3562..176fa522a 100644
--- 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 f3b7a9c83..f244ba490 100644
--- 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 393743962..4f2af415a 100644
--- 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 6855fc7ab..d6644f8eb 100644
--- 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