tidy-up: indent, whitespace, comment in sources

Cherry-picked from #14692
Closes #14995

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 39609bc38ae7cca0b045ec3f3d6b3cc996daf2e9..f247272a8aa823882e52581a6823e7469a50961e 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -21,7 +21,6 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-/* lib/curl_config.h.in. Generated somehow by cmake.  */
 
 /* Location of default ca bundle */
 #cmakedefine CURL_CA_BUNDLE "${CURL_CA_BUNDLE}"

diff --git a/lib/curlx.h b/lib/curlx.h
index 0391d7cd7f296cd635f83a7a2c69ccef86b0511b..f0e4e6470b188fec8838e506dea285cfdf107717 100644 (file)
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -66,13 +66,4 @@
 #include "version_win32.h"
 /* "version_win32.h" provides curlx_verify_windows_version() */
 
-/* Now setup curlx_ * names for the functions that are to become curlx_ and
-   be removed from a future libcurl official API:
-   curlx_getenv
-   curlx_mprintf (and its variations)
-   curlx_strcasecompare
-   curlx_strncasecompare
-
-*/
-
 #endif /* HEADER_CURL_CURLX_H */

diff --git a/lib/vquic/curl_msh3.c b/lib/vquic/curl_msh3.c
index dd13b4251ac07c8c9f843a81f923289368d7e663..e57a234ad04e8a96afb0b2053ee725e8460fb8fb 100644 (file)
--- a/lib/vquic/curl_msh3.c
+++ b/lib/vquic/curl_msh3.c
@@ -71,7 +71,7 @@
   pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \
   pthread_mutex_init(lock, &attr); \
   pthread_mutexattr_destroy(&attr); \
-}while(0)
+} while(0)
 #define msh3_lock_uninitialize(lock) pthread_mutex_destroy(lock)
 #define msh3_lock_acquire(lock) pthread_mutex_lock(lock)
 #define msh3_lock_release(lock) pthread_mutex_unlock(lock)

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index d9be33b8652cf9c502e1e78752199a51beb1ba5a..595c27285d993960be5669d65ce100e428160f5a 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -2924,7 +2924,7 @@ CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf,
 
     Curl_ssl_sessionid_lock(data);
     result = Curl_ssl_set_sessionid(cf, data, peer, der_session_buf,
-     der_session_size, ossl_session_free);
+                                    der_session_size, ossl_session_free);
     Curl_ssl_sessionid_unlock(data);
   }
 
@@ -4002,8 +4002,8 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
         octx->reused_session = TRUE;
       }
       else {
-          Curl_ssl_sessionid_unlock(data);
-          return CURLE_SSL_CONNECT_ERROR;
+        Curl_ssl_sessionid_unlock(data);
+        return CURLE_SSL_CONNECT_ERROR;
       }
     }
     Curl_ssl_sessionid_unlock(data);

diff --git a/m4/curl-override.m4 b/m4/curl-override.m4
index b4a8df9bb6e6d981bb3d359fc2017dcda25f6d2f..bc3f669c3a6d72129c8d792d1c94a43245d0b464 100644 (file)
--- a/m4/curl-override.m4
+++ b/m4/curl-override.m4
@@ -48,7 +48,7 @@ dnl a c89 compiler and does not support K&R.
 
 m4_define([AC_LANG_PROGRAM(C)],
 [$1
-int main (void)
+int main(void)
 {
 $2
  ;

diff --git a/src/tool_operate.c b/src/tool_operate.c
index b9b7bfdc382390542a6d5c4b286e6b424684ea3f..275f2584b8728ac8570babfde93cf907a1aa8547 100644 (file)
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -377,7 +377,7 @@ static CURLcode pre_transfer(struct GlobalConfig *global,
         break;
       default:
         per->infd = open(per->uploadfile, O_RDONLY | O_BINARY,
-                        "rfm=stmlf", "ctx=stm");
+                         "rfm=stmlf", "ctx=stm");
       }
     }
     if(per->infd == -1)

diff --git a/tests/libtest/lib3207.c b/tests/libtest/lib3207.c
index 7904a8be35f076abfc16c17d643c6de85b3e2ab5..f43f7d5b1054e42c265b405f605608acb1c74fe1 100644 (file)
--- a/tests/libtest/lib3207.c
+++ b/tests/libtest/lib3207.c
@@ -214,11 +214,11 @@ CURLcode test(char *URL)
       res = ctx[i].result;
     }
     else {
-        struct curl_slist *item = ctx[i].contents;
-        while(item) {
-          printf("%s", item->data);
-          item = item->next;
-        }
+      struct curl_slist *item = ctx[i].contents;
+      while(item) {
+        printf("%s", item->data);
+        item = item->next;
+      }
     }
     curl_slist_free_all(ctx[i].contents);
   }

diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index 86db0eb0ce955eddb0d581175543543a6722f481..c8c4a3330c2af9d6dfd3e778a12cf311a2ca0d68 100755 (executable)
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -1121,6 +1121,7 @@ if($error) {
     exit 1;
 }
 
+
 #***************************************************************************
 # Initialize client sftp config with options actually supported.
 #