.gitlab-ci.yml: indent code using Clang 17

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c005bd68e8a519bca48b776f20d91063d30028ce..945f1c97b5142693f62dd8c9c2df763d153feda4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,7 +160,7 @@ commit-check:
   cache: {}
   script:
     # we want $ALPINE_BASE_BUILD without git, so we are adding it here
-    - apk add git bash grep clang16-extra-tools
+    - apk add git bash grep clang17-extra-tools
     - devel/check_if_signed
     - PATH=/usr/lib/llvm16/bin:$PATH devel/indent-gnutls
     - devel/check-headers.sh

diff --git a/lib/crypto-backend.h b/lib/crypto-backend.h
index bfdcc4278dd1fb15e7e360bc566b1b5c9e8128a8..fd8ee0c72879f0572f18f1f541b3284dafd9b2bd 100644 (file)
--- a/lib/crypto-backend.h
+++ b/lib/crypto-backend.h
@@ -248,7 +248,7 @@ typedef enum {
 
 #define FIX_SIGN_PARAMS(params, flags, dig)                            \
        do {                                                           \
-               if ((flags)&GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE) {        \
+               if ((flags) & GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE) {      \
                        (params).flags |= GNUTLS_PK_FLAG_REPRODUCIBLE; \
                }                                                      \
                if ((params).pk == GNUTLS_PK_DSA ||                    \

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 6916f305a22b0407023224019ec272bb03b74852..058c63837d95c39925696dc5a8eef1784b18d2e7 100644 (file)
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -290,7 +290,7 @@ void gnutls_privkey_deinit(gnutls_privkey_t key);
        (unsigned int)((subgroup << 16) | (group))
 #define GNUTLS_BITS_TO_SUBGROUP(bits) ((bits >> 16) & 0xFFFF)
 #define GNUTLS_BITS_TO_GROUP(bits) (bits & 0xFFFF)
-#define GNUTLS_BITS_HAVE_SUBGROUP(bits) ((bits)&0xFFFF0000)
+#define GNUTLS_BITS_HAVE_SUBGROUP(bits) ((bits) & 0xFFFF0000)
 
 int gnutls_privkey_generate(gnutls_privkey_t key, gnutls_pk_algorithm_t algo,
                            unsigned int bits, unsigned int flags);

diff --git a/lib/tpm2_esys.c b/lib/tpm2_esys.c
index bfb5133bf61bdcb299d0b6cfc2912dc955072f42..c30f7707b39430f7a2b880ac3576fc6a962b899e 100644 (file)
--- a/lib/tpm2_esys.c
+++ b/lib/tpm2_esys.c
@@ -349,8 +349,8 @@ static const TPML_PCR_SELECTION all_creation_pcr = {
        .count = 0,
 };
 
-#define rc_is_key_auth_failed(rc) (((rc)&0xff) == TPM2_RC_BAD_AUTH)
-#define rc_is_parent_auth_failed(rc) (((rc)&0xff) == TPM2_RC_AUTH_FAIL)
+#define rc_is_key_auth_failed(rc) (((rc) & 0xff) == TPM2_RC_BAD_AUTH)
+#define rc_is_parent_auth_failed(rc) (((rc) & 0xff) == TPM2_RC_AUTH_FAIL)
 
 struct tpm2_info_st *tpm2_info_init(struct pin_info_st *pin)
 {

diff --git a/src/benchmark.c b/src/benchmark.c
index 9900682136c20c9692752ebd99bff077fae36831..0d8df7c93dee87a46033f258e5d86ca581f3ce9b 100644 (file)
--- a/src/benchmark.c
+++ b/src/benchmark.c
@@ -94,7 +94,7 @@ void start_benchmark(struct benchmark_st *st)
                fprintf(stderr, "error: CreateThread %u\n", GetLastError());
                exit(1);
        }
-       st->alarm_timeout.QuadPart = (BSECS)*10000000;
+       st->alarm_timeout.QuadPart = (BSECS) * 10000000;
        if (SetWaitableTimer(st->wtimer, &st->alarm_timeout, 0, NULL, NULL,
                             FALSE) == 0) {
                fprintf(stderr, "error: SetWaitableTimer %u\n", GetLastError());

diff --git a/tests/dtls-sliding-window.c b/tests/dtls-sliding-window.c
index a152c565ed46e13b441f42221ff081df28594ade..b50d0dada9de4ebd717e16c75c85d4f66302939c 100644 (file)
--- a/tests/dtls-sliding-window.c
+++ b/tests/dtls-sliding-window.c
@@ -50,7 +50,7 @@ int _dtls_record_check(struct record_parameters_st *rp, uint64_t _seq);
 
 #define RESET_WINDOW memset(&state, 0, sizeof(state))
 
-#define SET_WINDOW_NEXT(x) state.dtls_sw_next = (((x)&DTLS_SEQ_NUM_MASK))
+#define SET_WINDOW_NEXT(x) state.dtls_sw_next = (((x) & DTLS_SEQ_NUM_MASK))
 
 #define SET_WINDOW_LAST_RECV(x) \
        t = x;                  \