ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Clang-format header file changes

Browse Source
This commit is contained in:
Mark Andrews
2024-05-17 12:29:59 +10:00
committed by Evan Hunt
parent add3a6ee8c
commit b7de2c7cb9
9 changed files with 57 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/dns/include/dns/name.h
View File

@@ -166,28 +166,34 @@ extern const dns_name_t *dns_wildcardname;
* unsigned char offsets[] = { 0, 6 };
* dns_name_t value = DNS_NAME_INITABSOLUTE(data, offsets);
*/
#define DNS_NAME_INITNONABSOLUTE(A, B) \
{ \
.magic = DNS_NAME_MAGIC, .ndata = A, \
.length = (sizeof(A) - 1), .labels = sizeof(B), \
.attributes = { .readonly = true }, .offsets = B, \
.link = ISC_LINK_INITIALIZER, .list = ISC_LIST_INITIALIZER, \
#define DNS_NAME_INITNONABSOLUTE(A, B) \
{ \
.magic = DNS_NAME_MAGIC, \
.ndata = A, \
.length = (sizeof(A) - 1), \
.labels = sizeof(B), \
.attributes = { .readonly = true }, \
.offsets = B, \
.link = ISC_LINK_INITIALIZER, \
.list = ISC_LIST_INITIALIZER, \
}
#define DNS_NAME_INITABSOLUTE(A, B) \
{ \
.magic = DNS_NAME_MAGIC, .ndata = A, .length = sizeof(A), \
.labels = sizeof(B), \
.attributes = { .readonly = true, .absolute = true }, \
.offsets = B, .link = ISC_LINK_INITIALIZER, \
.list = ISC_LIST_INITIALIZER, \
#define DNS_NAME_INITABSOLUTE(A, B) \
{ \
.magic = DNS_NAME_MAGIC, \
.ndata = A, \
.length = sizeof(A), \
.labels = sizeof(B), \
.attributes = { .readonly = true, .absolute = true }, \
.offsets = B, \
.link = ISC_LINK_INITIALIZER, \
.list = ISC_LIST_INITIALIZER, \
}
#define DNS_NAME_INITEMPTY \
{ \
.magic = DNS_NAME_MAGIC, .link = ISC_LINK_INITIALIZER, \
.list = ISC_LIST_INITIALIZER \
}
#define DNS_NAME_INITEMPTY \
{ .magic = DNS_NAME_MAGIC, \
.link = ISC_LINK_INITIALIZER, \
.list = ISC_LIST_INITIALIZER }
/*%
* Standard sizes of a wire format name

9
lib/dns/include/dns/rdataset.h
View File

@@ -223,11 +223,10 @@ struct dns_rdataset {
#define DNS_RDATASET_COUNT_UNDEFINED UINT32_MAX
#define DNS_RDATASET_INIT \
{ \
.magic = DNS_RDATASET_MAGIC, .link = ISC_LINK_INITIALIZER, \
.count = DNS_RDATASET_COUNT_UNDEFINED \
}
#define DNS_RDATASET_INIT \
{ .magic = DNS_RDATASET_MAGIC, \
.link = ISC_LINK_INITIALIZER, \
.count = DNS_RDATASET_COUNT_UNDEFINED }
/*!
* \def DNS_RDATASETATTR_RENDERED

7
lib/isc/include/isc/list.h
View File

@@ -17,9 +17,10 @@
#define ISC_LINK_TOMBSTONE(type) ((type *)-1)
#define ISC_LIST_INITIALIZER \
{ \
.head = NULL, .tail = NULL, \
#define ISC_LIST_INITIALIZER \
{ \
.head = NULL, \
.tail = NULL, \
}
#define ISC_LINK_INITIALIZER_TYPE(type) \
{ \

12
lib/isc/net.c
View File

@@ -80,14 +80,10 @@
#ifdef __OpenBSD__
#define USE_SYSCTL_PORTRANGE
#define SYSCTL_V4PORTRANGE_LOW \
{ \
CTL_NET, PF_INET, IPPROTO_IP, IPCTL_IPPORT_HIFIRSTAUTO \
}
#define SYSCTL_V4PORTRANGE_HIGH \
{ \
CTL_NET, PF_INET, IPPROTO_IP, IPCTL_IPPORT_HILASTAUTO \
}
#define SYSCTL_V4PORTRANGE_LOW \
{ CTL_NET, PF_INET, IPPROTO_IP, IPCTL_IPPORT_HIFIRSTAUTO }
#define SYSCTL_V4PORTRANGE_HIGH \
{ CTL_NET, PF_INET, IPPROTO_IP, IPCTL_IPPORT_HILASTAUTO }
/* Same for IPv6 */
#define SYSCTL_V6PORTRANGE_LOW SYSCTL_V4PORTRANGE_LOW
#define SYSCTL_V6PORTRANGE_HIGH SYSCTL_V4PORTRANGE_HIGH

23
lib/isc/netmgr/http.c
View File

@@ -855,18 +855,13 @@ send_client_connection_header(isc_nm_http_session_t *session) {
return (true);
}
#define MAKE_NV(NAME, VALUE, VALUELEN) \
{ \
(uint8_t *)(uintptr_t)(NAME), (uint8_t *)(uintptr_t)(VALUE), \
sizeof(NAME) - 1, VALUELEN, NGHTTP2_NV_FLAG_NONE \
}
#define MAKE_NV(NAME, VALUE, VALUELEN) \
{ (uint8_t *)(uintptr_t)(NAME), (uint8_t *)(uintptr_t)(VALUE), \
sizeof(NAME) - 1, VALUELEN, NGHTTP2_NV_FLAG_NONE }
#define MAKE_NV2(NAME, VALUE) \
{ \
(uint8_t *)(uintptr_t)(NAME), (uint8_t *)(uintptr_t)(VALUE), \
sizeof(NAME) - 1, sizeof(VALUE) - 1, \
NGHTTP2_NV_FLAG_NONE \
}
#define MAKE_NV2(NAME, VALUE) \
{ (uint8_t *)(uintptr_t)(NAME), (uint8_t *)(uintptr_t)(VALUE), \
sizeof(NAME) - 1, sizeof(VALUE) - 1, NGHTTP2_NV_FLAG_NONE }
static ssize_t
client_read_callback(nghttp2_session *ngsession, int32_t stream_id,
@@ -2000,10 +1995,8 @@ server_send_response(nghttp2_session *ngsession, int32_t stream_id,
return (ISC_R_SUCCESS);
}
#define MAKE_ERROR_REPLY(tag, code, desc) \
{ \
tag, MAKE_NV2(":status", #code), desc \
}
#define MAKE_ERROR_REPLY(tag, code, desc) \
{ tag, MAKE_NV2(":status", #code), desc }
/*
* Here we use roughly the same error codes that Unbound uses.

43
tests/dns/rdata_test.c
View File

@@ -78,42 +78,19 @@ typedef struct wire_ok {
unsigned int loop;
} wire_ok_t;
#define COMPARE(r1, r2, answer) \
{ \
r1, r2, answer, __LINE__ \
}
#define COMPARE_SENTINEL() \
{ \
NULL, NULL, 0, __LINE__ \
}
#define COMPARE(r1, r2, answer) { r1, r2, answer, __LINE__ }
#define COMPARE_SENTINEL() { NULL, NULL, 0, __LINE__ }
#define TEXT_VALID_CHANGED(data_in, data_out) \
{ \
data_in, data_out, 0 \
}
#define TEXT_VALID(data) \
{ \
data, data, 0 \
}
#define TEXT_VALID_LOOP(loop, data) \
{ \
data, data, loop \
}
#define TEXT_VALID_LOOPCHG(loop, data_in, data_out) \
{ \
data_in, data_out, loop \
}
#define TEXT_INVALID(data) \
{ \
data, NULL, 0 \
}
#define TEXT_SENTINEL() TEXT_INVALID(NULL)
#define TEXT_VALID_CHANGED(data_in, data_out) { data_in, data_out, 0 }
#define TEXT_VALID(data) { data, data, 0 }
#define TEXT_VALID_LOOP(loop, data) { data, data, loop }
#define TEXT_VALID_LOOPCHG(loop, data_in, data_out) { data_in, data_out, loop }
#define TEXT_INVALID(data) { data, NULL, 0 }
#define TEXT_SENTINEL() TEXT_INVALID(NULL)
#define VARGC(...) (sizeof((unsigned char[]){ __VA_ARGS__ }))
#define WIRE_TEST(ok, loop, ...) \
{ \
{ __VA_ARGS__ }, VARGC(__VA_ARGS__), ok, loop \
}
#define WIRE_TEST(ok, loop, ...) \
{ { __VA_ARGS__ }, VARGC(__VA_ARGS__), ok, loop }
#define WIRE_VALID(...) WIRE_TEST(true, 0, __VA_ARGS__)
#define WIRE_VALID_LOOP(loop, ...) WIRE_TEST(true, loop, __VA_ARGS__)
/*

5
tests/dns/sigs_test.c
View File

@@ -59,10 +59,7 @@ typedef struct {
const char *type;
} zonediff_t;
#define ZONEDIFF_SENTINEL \
{ \
0, NULL, 0, NULL \
}
#define ZONEDIFF_SENTINEL { 0, NULL, 0, NULL }
/*%
* Structure defining a dns__zone_updatesigs() test.

5
tests/include/tests/dns.h
View File

@@ -44,10 +44,7 @@ typedef struct {
const char *rdata;
} zonechange_t;
#define ZONECHANGE_SENTINEL \
{ \
0, NULL, 0, NULL, NULL \
}
#define ZONECHANGE_SENTINEL { 0, NULL, 0, NULL, NULL }
isc_result_t
dns_test_makeview(const char *name, bool with_dispatchmgr, bool with_cache,

5
tests/include/tests/ns.h
View File

@@ -41,10 +41,7 @@ typedef struct ns_test_id {
int lineno;
} ns_test_id_t;
#define NS_TEST_ID(desc) \
{ \
.description = desc, .lineno = __LINE__ \
}
#define NS_TEST_ID(desc) { .description = desc, .lineno = __LINE__ }
extern dns_dispatchmgr_t *dispatchmgr;
extern ns_interfacemgr_t *interfacemgr;