moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

cleanup: insert newline after if() conditions

Browse Source 
Our code style mandates we put the conditional block on a separate
line. These mistakes are now detected by the updated checksrc.
This commit is contained in:
Daniel Stenberg 2020-03-30 10:55:31 +02:00
parent 529add48bc
commit 0e607542dc
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
6 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/if2ip.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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); unsigned int ifscope = Curl_ipv6_scope(iface->ifa_addr);
if(ifscope != remote_scope) { if(ifscope != remote_scope) {
/* We are interested only in interface addresses whose /* We are interested only in interface addresses whose scope
scope matches the remote address we want to matches the remote address we want to connect to: global
connect to: global for global, link-local for for global, link-local for link-local, etc... */
link-local, etc... */ if(res == IF2IP_NOT_FOUND)
if(res == IF2IP_NOT_FOUND) res = IF2IP_AF_NOT_SUPPORTED; res = IF2IP_AF_NOT_SUPPORTED;
continue; continue;
} }

3
lib/socks_gssapi.c
View File

@ -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_send_token);
gss_release_buffer(&gss_status, &gss_recv_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 */ /* analyse response */

3
lib/vtls/openssl.c
View File

@ -1824,7 +1824,8 @@ static CURLcode verifystatus(struct connectdata *conn,
} }
end: end:
if(br) OCSP_BASICRESP_free(br); if(br)
OCSP_BASICRESP_free(br);
OCSP_RESPONSE_free(rsp); OCSP_RESPONSE_free(rsp);
return result; return result;

3
src/tool_setopt.c
View File

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

8
tests/libtest/test.h
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -45,10 +45,12 @@
#include "curl_printf.h" #include "curl_printf.h"
#define test_setopt(A,B,C) \ #define test_setopt(A,B,C) \
if((res = curl_easy_setopt((A), (B), (C))) != CURLE_OK) goto test_cleanup if((res = curl_easy_setopt((A), (B), (C))) != CURLE_OK) \
goto test_cleanup
#define test_multi_setopt(A,B,C) \ #define test_multi_setopt(A,B,C) \
if((res = curl_multi_setopt((A), (B), (C))) != CURLE_OK) goto test_cleanup 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_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 */ extern char *libtest_arg3; /* set by first.c to the argv[3] or NULL */

6
tests/unit/unit1394.c
View File

@ -122,8 +122,10 @@ UNITTEST_START
fail("assertion failure"); fail("assertion failure");
} }
} }
if(certname) free(certname); if(certname)
if(passphrase) free(passphrase); free(certname);
if(passphrase)
free(passphrase);
} }
UNITTEST_STOP UNITTEST_STOP