upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-27 12:13:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[9.18] chg: ci: Update code formatting

Browse source 
Backport of MR !9533

Merge branch 'backport-nicki/update-code-format-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!9535
This commit is contained in:
Ondřej Surý 2024-09-21 11:20:47 +00:00
commit 5744c009eb
4 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.git-blame-ignore-revs
View file

@ -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

12
doc/arm/_ext/iscconf.py
View file

@ -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"""

5
lib/dns/include/dns/rdata.h
View file

@ -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

12
lib/isc/include/isc/net.h
View file

@ -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 } }