From: Viktor Szakats Date: Fri, 25 Oct 2024 22:23:19 +0000 (+0200) Subject: tidy-up: whitespace, fix CI spacecheck for docs X-Git-Tag: curl-8_11_0~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9acecc923df9ea8675f026ab173e8f2a6051822e;p=thirdparty%2Fcurl.git tidy-up: whitespace, fix CI spacecheck for docs Also: fixup CI spacecheck to apply to docs again. Closes #15423 --- diff --git a/.github/workflows/checkdocs.yml b/.github/workflows/checkdocs.yml index 88bd8d8cc6..45910b7db8 100644 --- a/.github/workflows/checkdocs.yml +++ b/.github/workflows/checkdocs.yml @@ -147,3 +147,13 @@ jobs: - name: verify examples run: .github/scripts/verify-examples.pl docs/libcurl/curl*.3 docs/libcurl/opts/*.3 + + miscchecks: + runs-on: ubuntu-24.04 + timeout-minutes: 5 + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + name: checkout + + - name: spacecheck + run: .github/scripts/spacecheck.pl diff --git a/CMake/CurlSymbolHiding.cmake b/CMake/CurlSymbolHiding.cmake index f507e45766..16ec3feccc 100644 --- a/CMake/CurlSymbolHiding.cmake +++ b/CMake/CurlSymbolHiding.cmake @@ -38,13 +38,13 @@ unset(CURL_CFLAG_SYMBOLS_HIDE) if(CURL_HIDDEN_SYMBOLS) if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT MSVC) set(CURL_HIDES_PRIVATE_SYMBOLS TRUE) - set(CURL_EXTERN_SYMBOL "__attribute__ ((__visibility__ (\"default\")))") + set(CURL_EXTERN_SYMBOL "__attribute__((__visibility__(\"default\")))") set(CURL_CFLAG_SYMBOLS_HIDE "-fvisibility=hidden") elseif(CMAKE_COMPILER_IS_GNUCC) if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) # Note: This is considered buggy prior to 4.0 but the autotools do not care, so let us ignore that fact set(CURL_HIDES_PRIVATE_SYMBOLS TRUE) - set(CURL_EXTERN_SYMBOL "__attribute__ ((__visibility__ (\"default\")))") + set(CURL_EXTERN_SYMBOL "__attribute__((__visibility__(\"default\")))") set(CURL_CFLAG_SYMBOLS_HIDE "-fvisibility=hidden") endif() elseif(CMAKE_C_COMPILER_ID MATCHES "SunPro" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0) @@ -53,7 +53,7 @@ if(CURL_HIDDEN_SYMBOLS) set(CURL_CFLAG_SYMBOLS_HIDE "-xldscope=hidden") elseif(CMAKE_C_COMPILER_ID MATCHES "Intel" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0) # Requires 9.1.045 set(CURL_HIDES_PRIVATE_SYMBOLS TRUE) - set(CURL_EXTERN_SYMBOL "__attribute__ ((__visibility__ (\"default\")))") + set(CURL_EXTERN_SYMBOL "__attribute__((__visibility__(\"default\")))") set(CURL_CFLAG_SYMBOLS_HIDE "-fvisibility=hidden") elseif(MSVC) set(CURL_HIDES_PRIVATE_SYMBOLS TRUE) diff --git a/docs/internals/MQTT.md b/docs/internals/MQTT.md index 05db7d5d1d..90d641b30c 100644 --- a/docs/internals/MQTT.md +++ b/docs/internals/MQTT.md @@ -14,6 +14,7 @@ Doing a "POST" publishes the post data to the topic and exits. ### Subscribing + Command usage: curl mqtt://host/topic @@ -25,6 +26,7 @@ Example subscribe: This will send an MQTT SUBSCRIBE packet for the topic `bedroom/temp` and listen in for incoming PUBLISH packets. ### Publishing + Command usage: curl -d payload mqtt://host/topic diff --git a/lib/conncache.c b/lib/conncache.c index 5ad48cdd78..589205bc15 100644 --- a/lib/conncache.c +++ b/lib/conncache.c @@ -170,7 +170,7 @@ int Curl_cpool_init(struct cpool *cpool, * Probably better to have an internal handle owned by the multi that * can be used for cpool operations. */ cpool->idata->multi = multi; - #ifdef DEBUGBUILD +#ifdef DEBUGBUILD if(getenv("CURL_DEBUG")) cpool->idata->set.verbose = TRUE; #endif diff --git a/lib/curl_gssapi.c b/lib/curl_gssapi.c index c6fe1256b2..b7e774cea0 100644 --- a/lib/curl_gssapi.c +++ b/lib/curl_gssapi.c @@ -35,7 +35,7 @@ #include "memdebug.h" #if defined(__GNUC__) -#define CURL_ALIGN8 __attribute__ ((aligned(8))) +#define CURL_ALIGN8 __attribute__((aligned(8))) #else #define CURL_ALIGN8 #endif diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index 79242faca7..787423d1ff 100644 --- a/m4/curl-compilers.m4 +++ b/m4/curl-compilers.m4 @@ -1379,7 +1379,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ case "$compiler_id" in CLANG|APPLECLANG) dnl All versions of clang support -fvisibility= - tmp_EXTERN="__attribute__ ((__visibility__ (\"default\")))" + tmp_EXTERN="__attribute__((__visibility__(\"default\")))" tmp_CFLAGS="-fvisibility=hidden" supports_symbol_hiding="yes" ;; @@ -1387,7 +1387,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ dnl Only gcc 3.4 or later if test "$compiler_num" -ge "304"; then if $CC --help --verbose 2>/dev/null | grep fvisibility= >/dev/null ; then - tmp_EXTERN="__attribute__ ((__visibility__ (\"default\")))" + tmp_EXTERN="__attribute__((__visibility__(\"default\")))" tmp_CFLAGS="-fvisibility=hidden" supports_symbol_hiding="yes" fi @@ -1406,7 +1406,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ printf("icc fvisibility bug test"); ]]) ],[ - tmp_EXTERN="__attribute__ ((__visibility__ (\"default\")))" + tmp_EXTERN="__attribute__((__visibility__(\"default\")))" tmp_CFLAGS="-fvisibility=hidden" supports_symbol_hiding="yes" ])