diff --git a/.github/scripts/verify-examples.pl b/.github/scripts/verify-examples.pl index ff275569e1..0b750711ea 100755 --- a/.github/scripts/verify-examples.pl +++ b/.github/scripts/verify-examples.pl @@ -90,4 +90,3 @@ for my $m (@files) { } } exit $error; - diff --git a/.github/scripts/verify-synopsis.pl b/.github/scripts/verify-synopsis.pl index 34f15a8e0c..9d32185035 100755 --- a/.github/scripts/verify-synopsis.pl +++ b/.github/scripts/verify-synopsis.pl @@ -78,4 +78,3 @@ for my $m (@files) { $error |= testcompile($m); } exit $error; - diff --git a/docs/libcurl/curl_mime_headers.3 b/docs/libcurl/curl_mime_headers.3 index dd6a416694..109663c386 100644 --- a/docs/libcurl/curl_mime_headers.3 +++ b/docs/libcurl/curl_mime_headers.3 @@ -81,4 +81,3 @@ CURLE_OK or a CURL error code upon failure. .SH "SEE ALSO" .BR curl_mime_addpart (3), .BR curl_mime_name (3) - diff --git a/docs/libcurl/curl_multi_cleanup.3 b/docs/libcurl/curl_multi_cleanup.3 index 751bce9fd9..5b4aae26ce 100644 --- a/docs/libcurl/curl_multi_cleanup.3 +++ b/docs/libcurl/curl_multi_cleanup.3 @@ -68,4 +68,3 @@ CURLM_OK is returned. .BR curl_multi_get_handles (3), .BR curl_easy_init (3), .BR curl_multi_init (3) - diff --git a/docs/libcurl/curl_multi_init.3 b/docs/libcurl/curl_multi_init.3 index 9b589a11ec..4501a00319 100644 --- a/docs/libcurl/curl_multi_init.3 +++ b/docs/libcurl/curl_multi_init.3 @@ -60,4 +60,3 @@ other curl functions. .BR curl_multi_get_handles (3), .BR curl_global_init (3), .BR curl_easy_init (3) - diff --git a/docs/libcurl/opts/CURLINFO_SIZE_UPLOAD_T.3 b/docs/libcurl/opts/CURLINFO_SIZE_UPLOAD_T.3 index 24230c0468..5f5dd766ae 100644 --- a/docs/libcurl/opts/CURLINFO_SIZE_UPLOAD_T.3 +++ b/docs/libcurl/opts/CURLINFO_SIZE_UPLOAD_T.3 @@ -68,4 +68,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .BR curl_easy_setopt (3), .BR CURLINFO_SIZE_DOWNLOAD_T (3), .BR CURLINFO_SIZE_UPLOAD (3) - diff --git a/docs/libcurl/opts/CURLINFO_SPEED_DOWNLOAD_T.3 b/docs/libcurl/opts/CURLINFO_SPEED_DOWNLOAD_T.3 index b17d282815..5bf2c285b5 100644 --- a/docs/libcurl/opts/CURLINFO_SPEED_DOWNLOAD_T.3 +++ b/docs/libcurl/opts/CURLINFO_SPEED_DOWNLOAD_T.3 @@ -68,4 +68,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .BR curl_easy_setopt (3), .BR CURLINFO_SIZE_UPLOAD_T (3), .BR CURLINFO_SPEED_UPLOAD_T (3) - diff --git a/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 b/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 index f90c772950..5ec1a450e7 100644 --- a/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 +++ b/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 @@ -79,4 +79,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .BR CURLOPT_MAXFILESIZE (3), .BR CURLOPT_UPLOAD_BUFFERSIZE (3), .BR CURLOPT_WRITEFUNCTION (3) - diff --git a/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 b/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 index f2f8628b46..9d1a9fd4ca 100644 --- a/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 +++ b/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 @@ -131,4 +131,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .BR CURLOPT_CLOSESOCKETFUNCTION (3), .BR CURLOPT_OPENSOCKETFUNCTION (3), .BR CURLOPT_SOCKOPTFUNCTION (3) - diff --git a/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3 b/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3 index 5bfa0ccdc2..702d979197 100644 --- a/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3 +++ b/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3 @@ -75,5 +75,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .BR CURLOPT_STDERR (3), .BR CURLOPT_DEBUGFUNCTION (3), .BR CURLOPT_URL (3) - - diff --git a/docs/libcurl/opts/CURLOPT_PROXY_PINNEDPUBLICKEY.3 b/docs/libcurl/opts/CURLOPT_PROXY_PINNEDPUBLICKEY.3 index 9a9ce119c3..631d42f806 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_PINNEDPUBLICKEY.3 +++ b/docs/libcurl/opts/CURLOPT_PROXY_PINNEDPUBLICKEY.3 @@ -119,4 +119,3 @@ CURLE_OUT_OF_MEMORY if there was insufficient heap space. .BR CURLOPT_PROXY_CAPATH (3), .BR CURLOPT_PROXY_SSL_VERIFYHOST (3), .BR CURLOPT_PROXY_SSL_VERIFYPEER (3) - diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.3 b/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.3 index 82a5bf9c29..ce79f44a6f 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.3 +++ b/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.3 @@ -77,4 +77,3 @@ CURLE_OUT_OF_MEMORY if there was insufficient heap space. .BR CURLOPT_SSLCERT (3), .BR CURLOPT_SSLKEY (3), .BR CURLOPT_SSLKEYTYPE (3) - diff --git a/docs/libcurl/opts/CURLOPT_PROXY_TLS13_CIPHERS.3 b/docs/libcurl/opts/CURLOPT_PROXY_TLS13_CIPHERS.3 index d64d17ccc7..fd187add89 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_TLS13_CIPHERS.3 +++ b/docs/libcurl/opts/CURLOPT_PROXY_TLS13_CIPHERS.3 @@ -78,4 +78,3 @@ Returns CURLE_OK if supported, CURLE_NOT_BUILT_IN otherwise. .BR CURLOPT_SSL_CIPHER_LIST (3), .BR CURLOPT_SSLVERSION (3), .BR CURLOPT_TLS13_CIPHERS (3) - diff --git a/docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_NEC.3 b/docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_NEC.3 index bc9ea693d0..2388a16860 100644 --- a/docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_NEC.3 +++ b/docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_NEC.3 @@ -63,5 +63,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .SH "SEE ALSO" .BR CURLOPT_SOCKS5_GSSAPI_SERVICE (3), .BR CURLOPT_PROXY (3) - - diff --git a/docs/libcurl/opts/CURLOPT_SSL_EC_CURVES.3 b/docs/libcurl/opts/CURLOPT_SSL_EC_CURVES.3 index 65b5407d54..ef123896b5 100644 --- a/docs/libcurl/opts/CURLOPT_SSL_EC_CURVES.3 +++ b/docs/libcurl/opts/CURLOPT_SSL_EC_CURVES.3 @@ -61,4 +61,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .BR CURLOPT_SSL_OPTIONS (3), .BR CURLOPT_SSL_CIPHER_LIST (3), .BR CURLOPT_TLS13_CIPHERS (3) - diff --git a/docs/libcurl/opts/CURLOPT_STDERR.3 b/docs/libcurl/opts/CURLOPT_STDERR.3 index 949841ddad..79a97d45c7 100644 --- a/docs/libcurl/opts/CURLOPT_STDERR.3 +++ b/docs/libcurl/opts/CURLOPT_STDERR.3 @@ -65,4 +65,3 @@ Returns CURLE_OK .BR CURLOPT_VERBOSE (3), .BR CURLOPT_NOPROGRESS (3), .BR CURLOPT_DEBUGFUNCTION (3) - diff --git a/docs/libcurl/opts/CURLOPT_STREAM_DEPENDS_E.3 b/docs/libcurl/opts/CURLOPT_STREAM_DEPENDS_E.3 index c84173d854..c26ba812d3 100644 --- a/docs/libcurl/opts/CURLOPT_STREAM_DEPENDS_E.3 +++ b/docs/libcurl/opts/CURLOPT_STREAM_DEPENDS_E.3 @@ -80,4 +80,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .BR CURLOPT_HTTP_VERSION (3), .BR CURLOPT_STREAM_DEPENDS (3), .BR CURLOPT_STREAM_WEIGHT (3) - diff --git a/docs/libcurl/opts/CURLOPT_TFTP_BLKSIZE.3 b/docs/libcurl/opts/CURLOPT_TFTP_BLKSIZE.3 index dcd3ea79a6..3b66a4ce3a 100644 --- a/docs/libcurl/opts/CURLOPT_TFTP_BLKSIZE.3 +++ b/docs/libcurl/opts/CURLOPT_TFTP_BLKSIZE.3 @@ -63,4 +63,3 @@ Added in 7.19.4 Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .SH "SEE ALSO" .BR CURLOPT_MAXFILESIZE (3) - diff --git a/docs/libcurl/opts/CURLOPT_TRAILERFUNCTION.3 b/docs/libcurl/opts/CURLOPT_TRAILERFUNCTION.3 index ed910a3d70..0d61d12910 100644 --- a/docs/libcurl/opts/CURLOPT_TRAILERFUNCTION.3 +++ b/docs/libcurl/opts/CURLOPT_TRAILERFUNCTION.3 @@ -107,4 +107,3 @@ Returns CURLE_OK. .SH "SEE ALSO" .BR CURLOPT_TRAILERDATA (3), .BR CURLOPT_WRITEFUNCTION (3) - diff --git a/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.3 b/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.3 index 020bfec9ec..dff01dc867 100644 --- a/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.3 +++ b/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.3 @@ -65,4 +65,3 @@ Along with FTP Returns CURLE_OK if FTP is supported, and CURLE_UNKNOWN_OPTION if not. .SH "SEE ALSO" .BR CURLOPT_CRLF (3) - diff --git a/docs/libcurl/opts/CURLOPT_USERAGENT.3 b/docs/libcurl/opts/CURLOPT_USERAGENT.3 index bcb6a3c63a..1ed5a7bc5f 100644 --- a/docs/libcurl/opts/CURLOPT_USERAGENT.3 +++ b/docs/libcurl/opts/CURLOPT_USERAGENT.3 @@ -66,4 +66,3 @@ CURLE_OUT_OF_MEMORY if there was insufficient heap space. .BR CURLOPT_HTTPHEADER (3), .BR CURLOPT_REFERER (3), .BR CURLOPT_REQUEST_TARGET (3) - diff --git a/docs/libcurl/opts/CURLOPT_XOAUTH2_BEARER.3 b/docs/libcurl/opts/CURLOPT_XOAUTH2_BEARER.3 index 0dc5242fdb..98ac90f1eb 100644 --- a/docs/libcurl/opts/CURLOPT_XOAUTH2_BEARER.3 +++ b/docs/libcurl/opts/CURLOPT_XOAUTH2_BEARER.3 @@ -67,4 +67,3 @@ CURLE_OUT_OF_MEMORY if there was insufficient heap space. .SH "SEE ALSO" .BR CURLOPT_MAIL_AUTH (3), .BR CURLOPT_USERNAME (3) - diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 28f4b8b9ac..a3275673a2 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -1796,8 +1796,8 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [ #ifdef HAVE_WINSOCK2_H WSADATA wsa; - if (WSAStartup(MAKEWORD(2,2), &wsa)) - exit(2); + if(WSAStartup(MAKEWORD(2, 2), &wsa)) + exit(2); #endif memset(&hints, 0, sizeof(hints)); diff --git a/projects/generate.bat b/projects/generate.bat index 7156a1731a..a110adffc3 100644 --- a/projects/generate.bat +++ b/projects/generate.bat @@ -58,7 +58,7 @@ rem *************************************************************************** set VERSION=VC14.10 ) else if /i "%~1" == "vc14.20" ( set VERSION=VC14.20 - )else if /i "%~1" == "vc14.30" ( + ) else if /i "%~1" == "vc14.30" ( set VERSION=VC14.30 ) else if /i "%~1" == "-clean" ( set MODE=CLEAN @@ -167,7 +167,7 @@ rem *************************************************************************** ) if not "%VERSION%" == "ALL" goto success - + :vc14.20 echo. diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index d0be36f154..cd798f0b97 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -412,7 +412,7 @@ sub sysread_or_die { sub startsf { my @mainsockfcmd = ("./server/sockfilt".exe_ext('SRV'), "--ipv$ipvnum", - "--port", $port, + "--port", $port, "--pidfile", $mainsockf_pidfile, "--portfile", $portfile, "--logfile", $mainsockf_logfile); diff --git a/tests/http/clients/.gitignore b/tests/http/clients/.gitignore index 8d885e16e0..f461524b3e 100644 --- a/tests/http/clients/.gitignore +++ b/tests/http/clients/.gitignore @@ -8,4 +8,4 @@ ws-data ws-pingpong h2-upgrade-extreme tls-session-reuse -h2-pausing \ No newline at end of file +h2-pausing