From 50221d6ff1ebfbd7bc97d11a17d12f0a5926d18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Fri, 20 Sep 2024 16:06:55 +0200 Subject: [PATCH 1/3] Update code formatting clang 19 was updated in the base image. (cherry picked from commit ebb5bd9c0f079de8970b538fe48e5f5c60ea7ee9) --- lib/dns/include/dns/rdata.h | 5 ++++- lib/isc/include/isc/net.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index 5cb5583c76..51dc0804b8 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 9099d48a22..1699d5f9fb 100644 --- a/lib/isc/include/isc/net.h +++ b/lib/isc/include/isc/net.h @@ -79,8 +79,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 } } @@ -90,8 +92,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 } } From 15b61602c6812e006fd21a20a7d96dcec77aa37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Fri, 20 Sep 2024 16:09:33 +0200 Subject: [PATCH 2/3] Fix arguments-renamed pylint issue in iscconf.py The argument name was different in the base class. (cherry picked from commit 833ea7926cf62358f1498692112411975d23ca6c) --- doc/arm/_ext/iscconf.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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""" From c8438e80f14455dc55861305547c092258b153d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Fri, 20 Sep 2024 16:52:21 +0200 Subject: [PATCH 3/3] Ignore clang-format reformatting commit (cherry picked from commit 28d4e866c787f71852399021c9f38eca495947e8) --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index a987961f48..68f8c0cc01 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -24,3 +24,5 @@ b8b9b4ac2c0ae88de85f4d83982edb97694959d7 26b6ce9a569105df86911160ca9cb686b230c49a # Reformat sources with up-to-date clang-format-19 fe8d6023e05416ba5c030bb65878a24a57aa16cb +# Reformat sources with up-to-date clang-format-19 +50221d6ff1ebfbd7bc97d11a17d12f0a5926d18a