From a3f30525d424e2b0c927381434b7010a75d7a350 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 21 Aug 2025 13:12:23 +0200 Subject: [PATCH 1/2] Update Clang to version 21 (cherry picked from commit 6770f3d6081ed249b74cceb6c8fae7916b5d484b) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b25c64b4a..e1f45bd2f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: TEST_PARALLEL_JOBS: 4 CONFIGURE: ./configure - CLANG_VERSION: 20 + CLANG_VERSION: 21 CLANG: "clang-${CLANG_VERSION}" SCAN_BUILD: "scan-build-${CLANG_VERSION}" LLVM_SYMBOLIZER: "/usr/lib/llvm-${CLANG_VERSION}/bin/llvm-symbolizer" From bc35b646b95efc12b57ef4e717d8bbbeaa6f3400 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Tue, 21 Oct 2025 12:12:01 +0200 Subject: [PATCH 2/2] Use clang-format-21 to update formatting --- lib/dns/include/dns/librpz.h | 2 +- lib/dns/include/dns/rrl.h | 4 ++-- tests/include/tests/isc.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h index d8eb795003..ea3339289b 100644 --- a/lib/dns/include/dns/librpz.h +++ b/lib/dns/include/dns/librpz.h @@ -171,7 +171,7 @@ typedef struct librpz_result { librpz_dznum_t dznum; /* dnsrpzd zone number */ librpz_cznum_t cznum; /* librpz client zone number */ librpz_trig_t trig : LIBRPZ_TRIG_SIZE; - bool log : 1; /* log rewrite at given log level */ + bool log : 1; /* log rewrite at given log level */ } librpz_result_t; /** diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h index bdffed99ac..48d582715a 100644 --- a/lib/dns/include/dns/rrl.h +++ b/lib/dns/include/dns/rrl.h @@ -112,11 +112,11 @@ struct dns_rrl_entry { unsigned int log_qname : DNS_RRL_QNAMES_BITS; #define DNS_RRL_TS_GEN_BITS 2 - unsigned int ts_gen : DNS_RRL_TS_GEN_BITS; + unsigned int ts_gen : DNS_RRL_TS_GEN_BITS; unsigned int ts_valid : 1; #define DNS_RRL_HASH_GEN_BITS 1 unsigned int hash_gen : DNS_RRL_HASH_GEN_BITS; - unsigned int logged : 1; + unsigned int logged : 1; #define DNS_RRL_LOG_BITS 11 unsigned int log_secs : DNS_RRL_LOG_BITS; diff --git a/tests/include/tests/isc.h b/tests/include/tests/isc.h index 4bfd34513c..338cdf8fa3 100644 --- a/tests/include/tests/isc.h +++ b/tests/include/tests/isc.h @@ -184,8 +184,8 @@ teardown_managers(void **state); setup_mctx(NULL); \ setup_workers(NULL); \ \ - while ((c = isc_commandline_parse(argc, argv, "dlt:")) != -1) \ - { \ + while ((c = isc_commandline_parse(argc, argv, "dlt:")) != \ + -1) { \ switch (c) { \ case 'd': \ debug = true; \