Clang-format header file changes

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 8180b1bb0385a30d856256c6f760c81681433970..7d90ff836f93d990c14275cac4e74b385cde3a28 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -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

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index c4c819b5a9e5fa4e53a2e67221754f7c82f1413e..a54cde615e24a3727bd10a274a1191c68b07867f 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -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

diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index 67ed208c2c0c34e94f644679a136731b57e79504..9668e89f9898cb10f5ed7b27ffe6ee91d07bc503 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/net.c b/lib/isc/net.c
index 038d2aa7725c6d558eb72636695974338a374747..19c15071df5bceffc9c63dbbd3cae632f83cf30b 100644 (file)
--- a/lib/isc/net.c
+++ b/lib/isc/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/netmgr/http.c b/lib/isc/netmgr/http.c
index d33d778df61c7ab13d42a003c0b1ea9426555f69..a807124c1de4a0b923a00b7c1424219c5970bb87 100644 (file)
--- a/lib/isc/netmgr/http.c
+++ b/lib/isc/netmgr/http.c
@@ -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.

diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c
index d52a1950dec3cde09b06844f1b7706d17ff04ed8..f5746279ab489c3bede2c1c105f12dd2911ca1e7 100644 (file)
--- a/tests/dns/rdata_test.c
+++ b/tests/dns/rdata_test.c
@@ -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__)
 /*

diff --git a/tests/dns/sigs_test.c b/tests/dns/sigs_test.c
index 09105040030b19358eebd861d53f7e4b16c25bb5..aeadb93ae60845a7c855aff29c1596ab770b2454 100644 (file)
--- a/tests/dns/sigs_test.c
+++ b/tests/dns/sigs_test.c
@@ -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.

diff --git a/tests/include/tests/dns.h b/tests/include/tests/dns.h
index 22a626f35e22fd645f2f00d223700ac9d3bda1a7..2ce75fcc96b764d4dea85782ed281eb3d02efc29 100644 (file)
--- a/tests/include/tests/dns.h
+++ b/tests/include/tests/dns.h
@@ -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,

diff --git a/tests/include/tests/ns.h b/tests/include/tests/ns.h
index 8661d1d8ddd8a52bdd50d22f128bc2dd62ad5815..c313abfa04d4edb2475dbe3d7d99cdf6cbc2366a 100644 (file)
--- a/tests/include/tests/ns.h
+++ b/tests/include/tests/ns.h
@@ -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;