diff options
author | Daniel Stenberg <daniel@haxx.se> | 2020-10-15 15:30:55 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2020-10-15 23:32:26 +0200 |
commit | 475c1aba68030bc21b8d0ed76a7028eb2e797f64 (patch) | |
tree | 44040f70841735b6394311bbef1b3840d47923dd /lib | |
parent | b7ea3d2c22fe76fd85d1c5c6672829960d1d6e36 (diff) | |
download | curl-475c1aba68030bc21b8d0ed76a7028eb2e797f64.tar.gz |
checksrc: warn on empty line before open brace
... and fix a few occurances
Closes #6088
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/checksrc.pl | 6 | ||||
-rw-r--r-- | lib/ftp.c | 1 | ||||
-rw-r--r-- | lib/multi.c | 1 | ||||
-rw-r--r-- | lib/vauth/ntlm.c | 1 | ||||
-rw-r--r-- | lib/vtls/openssl.c | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/lib/checksrc.pl b/lib/checksrc.pl index 78b9cef5b..126f3c77e 100755 --- a/lib/checksrc.pl +++ b/lib/checksrc.pl @@ -85,6 +85,7 @@ my %warnings = ( 'DOBRACE' => 'A single space between do and open brace', 'BRACEWHILE' => 'A single space between open brace and while', 'EXCLAMATIONSPACE' => 'Whitespace after exclamation mark in expression', + 'EMPTYLINEBRACE' => 'Empty line before the open brace', ); sub readskiplist { @@ -594,6 +595,11 @@ sub scanfile { checkwarn("PARENBRACE", $line, length($1)+1, $file, $l, "missing space after close paren"); } + # check for "^{" with an empty line before it + if(($l =~ /^\{/) && ($prevl =~ /^[ \t]*\z/)) { + checkwarn("EMPTYLINEBRACE", + $line, 0, $file, $l, "empty line before open brace"); + } # check for space before the semicolon last in a line if($l =~ /^(.*[^ ].*) ;$/) { @@ -901,7 +901,6 @@ typedef enum { static CURLcode ftp_state_use_port(struct connectdata *conn, ftpport fcmd) /* start with this */ - { CURLcode result = CURLE_OK; struct ftp_conn *ftpc = &conn->proto.ftpc; diff --git a/lib/multi.c b/lib/multi.c index 4cc7c5ae6..9f7de97be 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -3158,7 +3158,6 @@ CURLMcode curl_multi_socket_action(struct Curl_multi *multi, curl_socket_t s, } CURLMcode curl_multi_socket_all(struct Curl_multi *multi, int *running_handles) - { CURLMcode result; if(multi->in_callback) diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c index ecfeacb9a..540ac9482 100644 --- a/lib/vauth/ntlm.c +++ b/lib/vauth/ntlm.c @@ -497,7 +497,6 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data, const char *passwdp, struct ntlmdata *ntlm, char **outptr, size_t *outlen) - { /* NTLM type-3 message structure: diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 28a1ae6da..76d0bc413 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -3453,7 +3453,6 @@ typedef int numcert_t; static CURLcode get_cert_chain(struct connectdata *conn, struct ssl_connect_data *connssl) - { CURLcode result; STACK_OF(X509) *sk; |