moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

checksrc: force indentation of lines after an else 

This extends the INDENTATION case to also handle 'else' statements
and require proper indentation on the following line. Also fixes the
offending cases found in the codebase.

Closes #2532
This commit is contained in:
Daniel Gustafsson 2018-04-25 21:53:27 +02:00 committed by Daniel Stenberg
parent 1d71ce845a
commit 2f13e3d23d
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
7 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checksrc.pl
View File

@ -499,9 +499,9 @@ sub scanfile {
} }
# if the previous line starts with if/while/for AND ends with an open # if the previous line starts with if/while/for AND ends with an open
# brace, check that this line is indented $indent more steps, if not # brace, or an else statement, check that this line is indented $indent
# a cpp line # more steps, if not a cpp line
if($prevl =~ /^( *)(if|while|for)\(.*\{\z/) { if($prevl =~ /^( *)((if|while|for)\(.*\{|else)\z/) {
my $first = length($1); my $first = length($1);
# this line has some character besides spaces # this line has some character besides spaces
@ -511,7 +511,7 @@ sub scanfile {
if($expect != $second) { if($expect != $second) {
my $diff = $second - $first; my $diff = $second - $first;
checkwarn("INDENTATION", $line, length($1), $file, $ol, checkwarn("INDENTATION", $line, length($1), $file, $ol,
"not indented $indent steps, uses $diff)"); "not indented $indent steps (uses $diff)");
} }
} }

3
lib/multi.c
View File

@ -1798,8 +1798,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
if((data->easy_conn->sockfd != CURL_SOCKET_BAD) || if((data->easy_conn->sockfd != CURL_SOCKET_BAD) ||
(data->easy_conn->writesockfd != CURL_SOCKET_BAD)) (data->easy_conn->writesockfd != CURL_SOCKET_BAD))
multistate(data, CURLM_STATE_WAITPERFORM); multistate(data, CURLM_STATE_WAITPERFORM);
else else {
{
if(data->state.wildcardmatch && if(data->state.wildcardmatch &&
((data->easy_conn->handler->flags & PROTOPT_WILDCARD) == 0)) { ((data->easy_conn->handler->flags & PROTOPT_WILDCARD) == 0)) {
data->wildcard.state = CURLWC_DONE; data->wildcard.state = CURLWC_DONE;

3
lib/rtsp.c
View File

@ -764,8 +764,7 @@ CURLcode rtp_client_write(struct connectdata *conn, char *ptr, size_t len)
writeit = data->set.fwrite_rtp; writeit = data->set.fwrite_rtp;
user_ptr = data->set.rtp_out; user_ptr = data->set.rtp_out;
} }
else else {
{
writeit = data->set.fwrite_func; writeit = data->set.fwrite_func;
user_ptr = data->set.out; user_ptr = data->set.out;
} }

3
lib/telnet.c
View File

@ -1203,8 +1203,7 @@ CURLcode telrcv(struct connectdata *conn,
CURL_SB_ACCUM(tn, c); CURL_SB_ACCUM(tn, c);
tn->telrcv_state = CURL_TS_SB; tn->telrcv_state = CURL_TS_SB;
} }
else else {
{
CURL_SB_ACCUM(tn, CURL_IAC); CURL_SB_ACCUM(tn, CURL_IAC);
CURL_SB_ACCUM(tn, CURL_SE); CURL_SB_ACCUM(tn, CURL_SE);
tn->subpointer -= 2; tn->subpointer -= 2;

3
lib/vtls/schannel.c
View File

@ -544,8 +544,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex)
InitSecBuffer(&inbuf, SECBUFFER_APPLICATION_PROTOCOLS, alpn_buffer, cur); InitSecBuffer(&inbuf, SECBUFFER_APPLICATION_PROTOCOLS, alpn_buffer, cur);
InitSecBufferDesc(&inbuf_desc, &inbuf, 1); InitSecBufferDesc(&inbuf_desc, &inbuf, 1);
} }
else else {
{
InitSecBuffer(&inbuf, SECBUFFER_EMPTY, NULL, 0); InitSecBuffer(&inbuf, SECBUFFER_EMPTY, NULL, 0);
InitSecBufferDesc(&inbuf_desc, &inbuf, 1); InitSecBufferDesc(&inbuf_desc, &inbuf, 1);
} }

6
src/tool_operate.c
View File

@ -456,8 +456,7 @@ static CURLcode operate_do(struct GlobalConfig *global,
the number of resources as urlnum. */ the number of resources as urlnum. */
urlnum = count_next_metalink_resource(mlfile); urlnum = count_next_metalink_resource(mlfile);
} }
else else if(!config->globoff) {
if(!config->globoff) {
/* Unless explicitly shut off, we expand '{...}' and '[...]' /* Unless explicitly shut off, we expand '{...}' and '[...]'
expressions and return total number of URLs in pattern set */ expressions and return total number of URLs in pattern set */
result = glob_url(&urls, urlnode->url, &urlnum, result = glob_url(&urls, urlnode->url, &urlnum,
@ -1858,8 +1857,7 @@ static CURLcode operate_do(struct GlobalConfig *global,
*/ */
break; break;
} }
else else if(urlnum > 1) {
if(urlnum > 1) {
/* when url globbing, exit loop upon critical error */ /* when url globbing, exit loop upon critical error */
if(is_fatal_error(result)) if(is_fatal_error(result))
break; break;

2
tests/libtest/stub_gssapi.c
View File

@ -324,7 +324,7 @@ OM_uint32 gss_display_status(OM_uint32 *min,
if(status_string->value) if(status_string->value)
status_string->length = strlen(status_string->value); status_string->length = strlen(status_string->value);
else else
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
return GSS_S_COMPLETE; return GSS_S_COMPLETE;