From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 15 Oct 2020 13:30:55 +0000 (+0200)
Subject: checksrc: warn on empty line before open brace
X-Git-Tag: curl-7_74_0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=475c1aba68030bc21b8d0ed76a7028eb2e797f64;p=thirdparty%2Fcurl.git

checksrc: warn on empty line before open brace

... and fix a few occurances

Closes #6088
---

diff --git a/lib/checksrc.pl b/lib/checksrc.pl
index 78b9cef5bd..126f3c77ed 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 =~ /^(.*[^ ].*) ;$/) {
diff --git a/lib/ftp.c b/lib/ftp.c
index 11031da6fb..46533c71b8 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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 4cc7c5ae61..9f7de97be2 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 ecfeacb9af..540ac9482a 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 28a1ae6dab..76d0bc413d 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;
diff --git a/tests/unit/unit1604.c b/tests/unit/unit1604.c
index 9c4f77670f..74366d11f2 100644
--- a/tests/unit/unit1604.c
+++ b/tests/unit/unit1604.c
@@ -82,7 +82,6 @@ struct data {
 };
 
 UNITTEST_START
-
 { /* START sanitize_file_name */
   struct data data[] = {
     { "", 0,
@@ -349,7 +348,6 @@ UNITTEST_START
 
 #else
 UNITTEST_START
-
 {
   fprintf(stderr, "Skipped test not for this platform\n");
 }