diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f97ee43f6d..d99b9f04f5 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1542,5 +1542,5 @@ ffbe6b95371c99b7fb05e6de17a8d6b7bf4f629f
 b7de2c7cb959fa35099d72c3f9b13938348c74e6
 # Reformat sources with up-to-date clang-format-19
 ff69d07fed2619a9bedf5ccc18cf106b7dd49bef
-# Reformat shell scripts with shfmt
-4cb8b13987b930952238cc88e84272b8cf911933
+# Reformat sources with up-to-date clang-format-19
+ebb5bd9c0f079de8970b538fe48e5f5c60ea7ee9
diff --git a/doc/arm/_ext/iscconf.py b/doc/arm/_ext/iscconf.py
index 1ecd37cb8b..7c0a3c9511 100644
--- a/doc/arm/_ext/iscconf.py
+++ b/doc/arm/_ext/iscconf.py
@@ -226,16 +226,16 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
                 self.state.nested_parse(raw, self.content_offset, parsed)
                 return parsed
 
-            def transform_content(self, contentnode: addnodes.desc_content) -> None:
+            def transform_content(self, content_node: addnodes.desc_content) -> None:
                 """autogenerate content from structured data"""
                 self.workaround_transform_content = True
                 if self.isc_short:
-                    contentnode.insert(0, self.isc_short_node)
+                    content_node.insert(0, self.isc_short_node)
                 if self.isc_tags:
                     tags = nodes.paragraph()
                     tags += nodes.strong(text="Tags: ")
                     tags += nodes.Text(", ".join(self.isc_tags))
-                    contentnode.insert(0, tags)
+                    content_node.insert(0, tags)
 
                 iscconf = self.env.get_domain(domainname)
 
@@ -244,7 +244,7 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
                     return  # not defined in grammar, nothing to render
 
                 blocks = self.format_blocks(iscconf.statement_blocks[name])
-                contentnode.insert(0, blocks)
+                content_node.insert(0, blocks)
 
                 grammars = iscconf.statement_grammar_groups[name]
                 multi_grammar = len(grammars) > 1
@@ -257,11 +257,11 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
                     if "suppress_grammar" in self.options:
                         continue
                     grammarnode = self.format_grammar(multi_grammar, grammar_grp)
-                    contentnode.insert(0, grammarnode)
+                    content_node.insert(0, grammarnode)
 
                 warn = self.format_warnings(union_flags)
                 if len(warn):
-                    contentnode.insert(0, warn)
+                    content_node.insert(0, warn)
 
             def __init__(self, *args, **kwargs):
                 """Compability with Sphinx < 3.0.0"""
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index ddbaad713b..36f79c8edd 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -117,7 +117,10 @@ struct dns_rdata {
 	ISC_LINK(dns_rdata_t) link;
 };
 
-#define DNS_RDATA_INIT { NULL, 0, 0, 0, 0, { (void *)(-1), (void *)(-1) } }
+#define DNS_RDATA_INIT                                           \
+	{                                                        \
+		NULL, 0, 0, 0, 0, { (void *)(-1), (void *)(-1) } \
+	}
 
 #define DNS_RDATA_CHECKINITIALIZED
 #ifdef DNS_RDATA_CHECKINITIALIZED
diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index e7d0d565bf..eda799c60d 100644
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -78,8 +78,10 @@
 #ifndef IN6ADDR_LOOPBACK_INIT
 #ifdef s6_addr
 /*% IPv6 address loopback init */
-#define IN6ADDR_LOOPBACK_INIT \
-	{ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } } }
+#define IN6ADDR_LOOPBACK_INIT                                          \
+	{                                                              \
+		{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } } \
+	}
 #else /* ifdef s6_addr */
 #define IN6ADDR_LOOPBACK_INIT \
 	{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } }
@@ -89,8 +91,10 @@
 #ifndef IN6ADDR_V4MAPPED_INIT
 #ifdef s6_addr
 /*% IPv6 v4mapped prefix init */
-#define IN6ADDR_V4MAPPED_INIT \
-	{ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 } } }
+#define IN6ADDR_V4MAPPED_INIT                                                \
+	{                                                                    \
+		{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 } } \
+	}
 #else /* ifdef s6_addr */
 #define IN6ADDR_V4MAPPED_INIT \
 	{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 } }