From 6770f3d6081ed249b74cceb6c8fae7916b5d484b Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 21 Aug 2025 13:12:23 +0200
Subject: [PATCH 1/2] Update Clang to version 21

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c7f05c4dc..fc346865dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
   BUILD_PARALLEL_JOBS: 6
   TEST_PARALLEL_JOBS: 4
 
-  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 c56785659ecddc97c686ecc1cefb199fb72d1b21 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 21 Aug 2025 14:57:36 +0200
Subject: [PATCH 2/2] Use clang-format-21 to update formatting

---
 lib/dns/include/dns/rrl.h | 4 ++--
 lib/isc/log.c             | 3 ++-
 tests/include/tests/isc.h | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h
index 6c5be512fd..38461e7f5f 100644
--- a/lib/dns/include/dns/rrl.h
+++ b/lib/dns/include/dns/rrl.h
@@ -111,11 +111,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/lib/isc/log.c b/lib/isc/log.c
index 5c2bfe314b..ad984c0068 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1556,7 +1556,8 @@ isc__log_initialize(void) {
 
 	isc__lctx = isc_mem_get(mctx, sizeof(*isc__lctx));
 	*isc__lctx = (isc_log_t){
-		.magic = LCTX_MAGIC, .mctx = mctx, /* implicit attach */
+		.magic = LCTX_MAGIC,
+		.mctx = mctx, /* implicit attach */
 	};
 
 	isc_mutex_init(&isc__lctx->lock);
diff --git a/tests/include/tests/isc.h b/tests/include/tests/isc.h
index 1f6e3fb6c2..78e7e10614 100644
--- a/tests/include/tests/isc.h
+++ b/tests/include/tests/isc.h
@@ -180,8 +180,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;                                           \