mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Update code formatting

Browse Source 
clang 19 was updated in the base image.

(cherry picked from commit ff69d07fed)
This commit is contained in:
Michal Nowak
2024-09-10 17:31:32 +02:00
parent 30c4cbd403
commit 0aeefb9741
3 changed files with 30 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,10 +117,7 @@ struct dns_rdata {
ISC_LINK(dns_rdata_t) link; ISC_LINK(dns_rdata_t) link;
}; };
#define DNS_RDATA_INIT \ #define DNS_RDATA_INIT { NULL, 0, 0, 0, 0, { (void *)(-1), (void *)(-1) } }
{ \
NULL, 0, 0, 0, 0, { (void *)(-1), (void *)(-1) } \
}
#define DNS_RDATA_CHECKINITIALIZED #define DNS_RDATA_CHECKINITIALIZED
#ifdef DNS_RDATA_CHECKINITIALIZED #ifdef DNS_RDATA_CHECKINITIALIZED

54
lib/dns/rcode.c
View File

@@ -66,24 +66,20 @@
{ 14, "RESERVED14", TOTEXTONLY }, \ { 14, "RESERVED14", TOTEXTONLY }, \
{ 15, "RESERVED15", TOTEXTONLY }, { 15, "RESERVED15", TOTEXTONLY },
#define ERCODENAMES \ #define ERCODENAMES \
/* extended rcodes */ \ /* extended rcodes */ \
{ dns_rcode_badvers, "BADVERS", 0 }, \ { dns_rcode_badvers, "BADVERS", 0 }, \
{ dns_rcode_badcookie, "BADCOOKIE", 0 }, { \ { dns_rcode_badcookie, "BADCOOKIE", 0 }, { 0, NULL, 0 }
0, NULL, 0 \
}
#define TSIGRCODENAMES \ #define TSIGRCODENAMES \
/* extended rcodes */ \ /* extended rcodes */ \
{ dns_tsigerror_badsig, "BADSIG", 0 }, \ { dns_tsigerror_badsig, "BADSIG", 0 }, \
{ dns_tsigerror_badkey, "BADKEY", 0 }, \ { dns_tsigerror_badkey, "BADKEY", 0 }, \
{ dns_tsigerror_badtime, "BADTIME", 0 }, \ { dns_tsigerror_badtime, "BADTIME", 0 }, \
{ dns_tsigerror_badmode, "BADMODE", 0 }, \ { dns_tsigerror_badmode, "BADMODE", 0 }, \
{ dns_tsigerror_badname, "BADNAME", 0 }, \ { dns_tsigerror_badname, "BADNAME", 0 }, \
{ dns_tsigerror_badalg, "BADALG", 0 }, \ { dns_tsigerror_badalg, "BADALG", 0 }, \
{ dns_tsigerror_badtrunc, "BADTRUNC", 0 }, { \ { dns_tsigerror_badtrunc, "BADTRUNC", 0 }, { 0, NULL, 0 }
0, NULL, 0 \
}
/* RFC4398 section 2.1 */ /* RFC4398 section 2.1 */
@@ -91,9 +87,7 @@
{ 1, "PKIX", 0 }, { 2, "SPKI", 0 }, { 3, "PGP", 0 }, \ { 1, "PKIX", 0 }, { 2, "SPKI", 0 }, { 3, "PGP", 0 }, \
{ 4, "IPKIX", 0 }, { 5, "ISPKI", 0 }, { 6, "IPGP", 0 }, \ { 4, "IPKIX", 0 }, { 5, "ISPKI", 0 }, { 6, "IPGP", 0 }, \
{ 7, "ACPKIX", 0 }, { 8, "IACPKIX", 0 }, { 253, "URI", 0 }, \ { 7, "ACPKIX", 0 }, { 8, "IACPKIX", 0 }, { 253, "URI", 0 }, \
{ 254, "OID", 0 }, { \ { 254, "OID", 0 }, { 0, NULL, 0 }
0, NULL, 0 \
}
/* RFC2535 section 7, RFC3110 */ /* RFC2535 section 7, RFC3110 */
@@ -115,20 +109,16 @@
{ DNS_KEYALG_ED448, "ED448", 0 }, \ { DNS_KEYALG_ED448, "ED448", 0 }, \
{ DNS_KEYALG_INDIRECT, "INDIRECT", 0 }, \ { DNS_KEYALG_INDIRECT, "INDIRECT", 0 }, \
{ DNS_KEYALG_PRIVATEDNS, "PRIVATEDNS", 0 }, \ { DNS_KEYALG_PRIVATEDNS, "PRIVATEDNS", 0 }, \
{ DNS_KEYALG_PRIVATEOID, "PRIVATEOID", 0 }, { \ { DNS_KEYALG_PRIVATEOID, "PRIVATEOID", 0 }, { 0, NULL, 0 }
0, NULL, 0 \
}
/* RFC2535 section 7.1 */ /* RFC2535 section 7.1 */
#define SECPROTONAMES \ #define SECPROTONAMES \
{ 0, "NONE", 0 }, { 1, "TLS", 0 }, { 2, "EMAIL", 0 }, \ { 0, "NONE", 0 }, { 1, "TLS", 0 }, { 2, "EMAIL", 0 }, \
{ 3, "DNSSEC", 0 }, { 4, "IPSEC", 0 }, { 255, "ALL", 0 }, { \ { 3, "DNSSEC", 0 }, { 4, "IPSEC", 0 }, { 255, "ALL", 0 }, \
0, NULL, 0 \ { 0, NULL, 0 }
}
#define HASHALGNAMES \ #define HASHALGNAMES { 1, "SHA-1", 0 }, { 0, NULL, 0 }
{ 1, "SHA-1", 0 }, { 0, NULL, 0 }
/* RFC3658, RFC4509, RFC5933, RFC6605 */ /* RFC3658, RFC4509, RFC5933, RFC6605 */
@@ -138,9 +128,7 @@
{ DNS_DSDIGEST_SHA256, "SHA256", 0 }, \ { DNS_DSDIGEST_SHA256, "SHA256", 0 }, \
{ DNS_DSDIGEST_GOST, "GOST", 0 }, \ { DNS_DSDIGEST_GOST, "GOST", 0 }, \
{ DNS_DSDIGEST_SHA384, "SHA-384", 0 }, \ { DNS_DSDIGEST_SHA384, "SHA-384", 0 }, \
{ DNS_DSDIGEST_SHA384, "SHA384", 0 }, { \ { DNS_DSDIGEST_SHA384, "SHA384", 0 }, { 0, NULL, 0 }
0, NULL, 0 \
}
struct tbl { struct tbl {
unsigned int value; unsigned int value;

37
lib/isc/include/isc/net.h
View File

@@ -78,43 +78,22 @@
#ifndef IN6ADDR_LOOPBACK_INIT #ifndef IN6ADDR_LOOPBACK_INIT
#ifdef s6_addr #ifdef s6_addr
/*% IPv6 address loopback init */ /*% IPv6 address loopback init */
#define IN6ADDR_LOOPBACK_INIT \ #define IN6ADDR_LOOPBACK_INIT \
{ \ { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } } }
{ \
{ \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 \
} \
} \
}
#else /* ifdef s6_addr */ #else /* ifdef s6_addr */
#define IN6ADDR_LOOPBACK_INIT \ #define IN6ADDR_LOOPBACK_INIT \
{ \ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } }
{ \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 \
} \
}
#endif /* ifdef s6_addr */ #endif /* ifdef s6_addr */
#endif /* ifndef IN6ADDR_LOOPBACK_INIT */ #endif /* ifndef IN6ADDR_LOOPBACK_INIT */
#ifndef IN6ADDR_V4MAPPED_INIT #ifndef IN6ADDR_V4MAPPED_INIT
#ifdef s6_addr #ifdef s6_addr
/*% IPv6 v4mapped prefix init */ /*% IPv6 v4mapped prefix init */
#define IN6ADDR_V4MAPPED_INIT \ #define IN6ADDR_V4MAPPED_INIT \
{ \ { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 } } }
{ \
{ \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, \
0, 0, 0 \
} \
} \
}
#else /* ifdef s6_addr */ #else /* ifdef s6_addr */
#define IN6ADDR_V4MAPPED_INIT \ #define IN6ADDR_V4MAPPED_INIT \
{ \ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 } }
{ \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 \
} \
}
#endif /* ifdef s6_addr */ #endif /* ifdef s6_addr */
#endif /* ifndef IN6ADDR_V4MAPPED_INIT */ #endif /* ifndef IN6ADDR_V4MAPPED_INIT */