Clang-format header file changes

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 2e1c5f882bf00d02bdf0950f4b4632bc985fb70d..5a95f3c09955765259fc4328be2fff2534850e3a 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -169,25 +169,33 @@ LIBDNS_EXTERNAL_DATA 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)                                   \
-       {                                                                \
-               DNS_NAME_MAGIC, A, (sizeof(A) - 1), sizeof(B),           \
-                       DNS_NAMEATTR_READONLY, B, NULL,                  \
-                       { (void *)-1, (void *)-1 }, { NULL, NULL }, NULL \
-       }
-
-#define DNS_NAME_INITABSOLUTE(A, B)                                            \
-       {                                                                      \
-               DNS_NAME_MAGIC, A, sizeof(A), sizeof(B),                       \
-                       DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, B,      \
-                       NULL, { (void *)-1, (void *)-1 }, { NULL, NULL }, NULL \
-       }
-
-#define DNS_NAME_INITEMPTY                                               \
-       {                                                                \
-               DNS_NAME_MAGIC, NULL, 0, 0, 0, NULL, NULL,               \
-                       { (void *)-1, (void *)-1 }, { NULL, NULL }, NULL \
-       }
+#define DNS_NAME_INITNONABSOLUTE(A, B) \
+       { DNS_NAME_MAGIC,              \
+         A,                           \
+         (sizeof(A) - 1),             \
+         sizeof(B),                   \
+         DNS_NAMEATTR_READONLY,       \
+         B,                           \
+         NULL,                        \
+         { (void *)-1, (void *)-1 },  \
+         { NULL, NULL },              \
+         NULL }
+
+#define DNS_NAME_INITABSOLUTE(A, B)                      \
+       { DNS_NAME_MAGIC,                                \
+         A,                                             \
+         sizeof(A),                                     \
+         sizeof(B),                                     \
+         DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, \
+         B,                                             \
+         NULL,                                          \
+         { (void *)-1, (void *)-1 },                    \
+         { NULL, NULL },                                \
+         NULL }
+
+#define DNS_NAME_INITEMPTY                                                       \
+       { DNS_NAME_MAGIC, NULL, 0, 0, 0, NULL, NULL, { (void *)-1, (void *)-1 }, \
+         { NULL, NULL }, NULL }
 
 /*%
  * Standard size of a wire format name

diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h
index f19b5185c782cec7842449762d77732ffa3b8096..c30545c7f5d2f87b446a0c9c71d4e6c15e4db9b8 100644 (file)
--- a/lib/dns/tests/dnstest.h
+++ b/lib/dns/tests/dnstest.h
@@ -37,10 +37,7 @@ typedef struct {
        const char *rdata;
 } zonechange_t;
 
-#define ZONECHANGE_SENTINEL            \
-       {                              \
-               0, NULL, 0, NULL, NULL \
-       }
+#define ZONECHANGE_SENTINEL { 0, NULL, 0, NULL, NULL }
 
 extern isc_mem_t *dt_mctx;
 extern isc_log_t *lctx;

diff --git a/lib/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c
index 9bcac9911304f978e818f5d88527fe2bdfc11d92..fb37d13bd7059df32b49d1b7ed892994ab4405bc 100644 (file)
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -97,42 +97,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__)
 /*

diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c
index 8e438cb3fc60bb306776c7bfb4baa9969f14c169..4e5aadb80fcd46c07f024f9ec0cf0d2a30123d96 100644 (file)
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -81,10 +81,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.

diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index 2cf4437542dfa41031647966b3df99237427ee77..81f561e79c4dc927607caed4b7590e966bcf5acc 100644 (file)
--- a/lib/isc/include/isc/list.h
+++ b/lib/isc/include/isc/list.h
@@ -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)           \
        {                                         \

diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index 1e43b4b41d9d614e2627a8346895c960e3287b93..9c7daa59ee03cdd2425f46fcadb98fcd3091cc93 100644 (file)
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -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

diff --git a/lib/isc/win32/include/isc/once.h b/lib/isc/win32/include/isc/once.h
index d2d841f95d294e882dad762afd37489121d0e469..270bd4eb1785de2550fc8de74b8082c5f5052200 100644 (file)
--- a/lib/isc/win32/include/isc/once.h
+++ b/lib/isc/win32/include/isc/once.h
@@ -27,10 +27,7 @@ typedef struct {
 #define ISC_ONCE_INIT_NEEDED 0
 #define ISC_ONCE_INIT_DONE   1
 
-#define ISC_ONCE_INIT                   \
-       {                               \
-               ISC_ONCE_INIT_NEEDED, 1 \
-       }
+#define ISC_ONCE_INIT { ISC_ONCE_INIT_NEEDED, 1 }
 
 isc_result_t
 isc_once_do(isc_once_t *controller, void (*function)(void));

diff --git a/lib/ns/tests/nstest.h b/lib/ns/tests/nstest.h
index 87a26a686406ef9467ff3cda9475dd920c000ad3..91b9810dd9d1600c804cc51742c0aa76b7e60be1 100644 (file)
--- a/lib/ns/tests/nstest.h
+++ b/lib/ns/tests/nstest.h
@@ -37,10 +37,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__ }
 
 #define CHECK(r)                             \
        do {                                 \