From: Viktor Szakats Date: Thu, 4 Sep 2025 13:25:27 +0000 (+0200) Subject: spacecheck: warn for 3+ empty lines in a row, fix fallouts X-Git-Tag: curl-8_16_0~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec9cb618a0a580b54cb1b250a51bda61e0e45811;p=thirdparty%2Fcurl.git spacecheck: warn for 3+ empty lines in a row, fix fallouts Closes #18478 --- diff --git a/.github/scripts/spacecheck.pl b/.github/scripts/spacecheck.pl index b395ee35e0..e61d30b5b0 100755 --- a/.github/scripts/spacecheck.pl +++ b/.github/scripts/spacecheck.pl @@ -151,6 +151,11 @@ while(my $filename = <$git_ls_files>) { push @err, "content: has multiple EOL at EOF"; } + if($content =~ /\n\n\n\n/ || + $content =~ /\r\n\r\n\r\n\r\n/) { + push @err, "content: has 3 or more consecutive empty lines"; + } + if($content =~ /([\x00-\x08\x0b\x0c\x0e-\x1f\x7f])/) { push @err, "content: has binary contents"; } diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c index f411d2ea6c..d30b944bbc 100644 --- a/docs/examples/ephiperfifo.c +++ b/docs/examples/ephiperfifo.c @@ -245,7 +245,6 @@ static void timer_cb(struct GlobalInfo *g, int revents) } - /* Clean up the SockInfo structure */ static void remsock(struct SockInfo *f, struct GlobalInfo *g) { @@ -260,7 +259,6 @@ static void remsock(struct SockInfo *f, struct GlobalInfo *g) } - /* Assign information to a SockInfo structure */ static void setsock(struct SockInfo *f, curl_socket_t s, CURL *e, int act, struct GlobalInfo *g) @@ -287,7 +285,6 @@ static void setsock(struct SockInfo *f, curl_socket_t s, CURL *e, int act, } - /* Initialize a new SockInfo structure */ static void addsock(curl_socket_t s, CURL *easy, int action, struct GlobalInfo *g) @@ -328,7 +325,6 @@ static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) } - /* CURLOPT_WRITEFUNCTION */ static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *data) { diff --git a/docs/examples/evhiperfifo.c b/docs/examples/evhiperfifo.c index 96937fc628..b28f057c82 100644 --- a/docs/examples/evhiperfifo.c +++ b/docs/examples/evhiperfifo.c @@ -165,7 +165,6 @@ static void mcode_or_die(const char *where, CURLMcode code) } - /* Check for completed transfers, and remove their easy handles */ static void check_multi_info(struct GlobalInfo *g) { @@ -193,7 +192,6 @@ static void check_multi_info(struct GlobalInfo *g) } - /* Called by libevent when we get action on a multi socket */ static void event_cb(EV_P_ struct ev_io *w, int revents) { @@ -243,7 +241,6 @@ static void remsock(struct SockInfo *f, struct GlobalInfo *g) } - /* Assign information to a SockInfo structure */ static void setsock(struct SockInfo *f, curl_socket_t s, CURL *e, int act, struct GlobalInfo *g) @@ -265,7 +262,6 @@ static void setsock(struct SockInfo *f, curl_socket_t s, CURL *e, int act, } - /* Initialize a new SockInfo structure */ static void addsock(curl_socket_t s, CURL *easy, int action, struct GlobalInfo *g) diff --git a/docs/examples/hiperfifo.c b/docs/examples/hiperfifo.c index d1e534ffbd..35a519b63e 100644 --- a/docs/examples/hiperfifo.c +++ b/docs/examples/hiperfifo.c @@ -188,7 +188,6 @@ static void check_multi_info(struct GlobalInfo *g) } - /* Called by libevent when we get action on a multi socket */ static void event_cb(int fd, short kind, void *userp) { @@ -212,7 +211,6 @@ static void event_cb(int fd, short kind, void *userp) } - /* Called by libevent when our timeout expires */ static void timer_cb(int fd, short kind, void *userp) { @@ -228,7 +226,6 @@ static void timer_cb(int fd, short kind, void *userp) } - /* Clean up the SockInfo structure */ static void remsock(struct SockInfo *f) { @@ -241,7 +238,6 @@ static void remsock(struct SockInfo *f) } - /* Assign information to a SockInfo structure */ static void setsock(struct SockInfo *f, curl_socket_t s, CURL *e, int act, struct GlobalInfo *g) @@ -261,7 +257,6 @@ static void setsock(struct SockInfo *f, curl_socket_t s, CURL *e, int act, } - /* Initialize a new SockInfo structure */ static void addsock(curl_socket_t s, CURL *easy, int action, struct GlobalInfo *g) @@ -302,7 +297,6 @@ static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) } - /* CURLOPT_WRITEFUNCTION */ static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *data) { diff --git a/lib/bufq.c b/lib/bufq.c index 40d1af0c1d..5cfd7520f2 100644 --- a/lib/bufq.c +++ b/lib/bufq.c @@ -149,7 +149,6 @@ static void chunk_list_free(struct buf_chunk **anchor) } - void Curl_bufcp_init(struct bufc_pool *pool, size_t chunk_size, size_t spare_max) { diff --git a/lib/curl_sha512_256.c b/lib/curl_sha512_256.c index e11b2d6a9c..7e9b223387 100644 --- a/lib/curl_sha512_256.c +++ b/lib/curl_sha512_256.c @@ -665,7 +665,6 @@ static CURLcode Curl_sha512_256_update(void *context, } - /** * Size of "length" insertion in bits. * See FIPS PUB 180-4 section 5.1.2. diff --git a/lib/ftp.c b/lib/ftp.c index 6d7c210ce5..29c2f789a3 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -3774,7 +3774,6 @@ static CURLcode ftp_do_more(struct Curl_easy *data, int *completep) } - /*********************************************************************** * * ftp_perform() diff --git a/lib/mime.c b/lib/mime.c index adce922950..894413be17 100644 --- a/lib/mime.c +++ b/lib/mime.c @@ -129,7 +129,6 @@ static const char aschex[] = "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x41\x42\x43\x44\x45\x46"; - #ifndef __VMS #define filesize(name, stat_data) (stat_data.st_size) #define fopen_read fopen diff --git a/lib/ws.c b/lib/ws.c index a73ab61b0b..229539c3f3 100644 --- a/lib/ws.c +++ b/lib/ws.c @@ -882,7 +882,6 @@ static CURLcode ws_enc_write_payload(struct ws_encoder *enc, } - struct cr_ws_ctx { struct Curl_creader super; BIT(read_eos); /* we read an EOS from the next reader */ diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 41bd24237f..e7699e1686 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -256,7 +256,6 @@ _ TELNET _ TFTP - Compiling on OS/400: These instructions targets people who knows about OS/400, compiling, IFS and @@ -328,7 +327,6 @@ _ Do not use original source include files unless you know what you are doing. /curl/include/curl). - ILE/RPG support: Since most of the ILE OS/400 programmers use ILE/RPG exclusively, a diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index dd0e2e7c4d..9742272a44 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -1222,7 +1222,6 @@ static int test_width_precision(void) } - static int test_weird_arguments(void) { int errors = 0; diff --git a/tests/runner.pm b/tests/runner.pm index 6fe327a6b7..62f722f319 100644 --- a/tests/runner.pm +++ b/tests/runner.pm @@ -1140,7 +1140,6 @@ sub singletest_postcheck { } - ################################################################### # Get ready to run a single test case sub runner_test_preprocess { diff --git a/tests/servers.pm b/tests/servers.pm index 41b7ae41c9..e625058870 100644 --- a/tests/servers.pm +++ b/tests/servers.pm @@ -2244,8 +2244,6 @@ sub runnegtelnetserver { } - - ####################################################################### # Single shot http and gopher server responsiveness test. This should only # be used to verify that a server present in %run hash is still functional diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 8d1dd28881..509e43e263 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -422,7 +422,6 @@ CFGSET = true !ENDIF - # CURL_XX macros are for the curl.exe command !IF "$(DEBUG)"=="yes"