Use clang-format-22 to update formatting

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 08020fd494b1e6dd4cb6e2b3764921ff99e07104..56b473cf3ddfbde4768eea83ff7b0127aa9047d0 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -58,11 +58,11 @@
 
 #define STATS_XML_VERSION_MAJOR "3"
 #define STATS_XML_VERSION_MINOR "14"
-#define STATS_XML_VERSION      STATS_XML_VERSION_MAJOR "." STATS_XML_VERSION_MINOR
+#define STATS_XML_VERSION STATS_XML_VERSION_MAJOR "." STATS_XML_VERSION_MINOR
 
 #define STATS_JSON_VERSION_MAJOR "1"
 #define STATS_JSON_VERSION_MINOR "8"
-#define STATS_JSON_VERSION      STATS_JSON_VERSION_MAJOR "." STATS_JSON_VERSION_MINOR
+#define STATS_JSON_VERSION STATS_JSON_VERSION_MAJOR "." STATS_JSON_VERSION_MINOR
 
 struct named_statschannel {
        /* Unlocked */

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 217356fd27b9c20925462555d50c474f76cf936a..5e16f0b7fb0a9b28014553fa08b505f1fe51d01b 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -424,12 +424,12 @@ enum {
  */
 #define FIND_WANTEVENT(fn)     (((fn)->options & DNS_ADBFIND_WANTEVENT) != 0)
 #define FIND_WANTEMPTYEVENT(fn) (((fn)->options & DNS_ADBFIND_EMPTYEVENT) != 0)
-#define FIND_AVOIDFETCHES(fn)  (((fn)->options & DNS_ADBFIND_AVOIDFETCHES) != 0)
-#define FIND_STARTATZONE(fn)   (((fn)->options & DNS_ADBFIND_STARTATZONE) != 0)
-#define FIND_STATICSTUB(fn)    (((fn)->options & DNS_ADBFIND_STATICSTUB) != 0)
-#define FIND_NOVALIDATE(fn)    (((fn)->options & DNS_ADBFIND_NOVALIDATE) != 0)
-#define FIND_HAS_ADDRS(fn)     (!ISC_LIST_EMPTY((fn)->list))
-#define FIND_NOFETCH(fn)       (((fn)->options & DNS_ADBFIND_NOFETCH) != 0)
+#define FIND_AVOIDFETCHES(fn) (((fn)->options & DNS_ADBFIND_AVOIDFETCHES) != 0)
+#define FIND_STARTATZONE(fn)  (((fn)->options & DNS_ADBFIND_STARTATZONE) != 0)
+#define FIND_STATICSTUB(fn)   (((fn)->options & DNS_ADBFIND_STATICSTUB) != 0)
+#define FIND_NOVALIDATE(fn)   (((fn)->options & DNS_ADBFIND_NOVALIDATE) != 0)
+#define FIND_HAS_ADDRS(fn)    (!ISC_LIST_EMPTY((fn)->list))
+#define FIND_NOFETCH(fn)      (((fn)->options & DNS_ADBFIND_NOFETCH) != 0)
 
 #define ADBNAME_TYPE_MASK                                   \
        (DNS_ADBFIND_STARTATZONE | DNS_ADBFIND_STATICSTUB | \

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 17f7f97d118e431f5934f17a87e76d3aa6ca6ec5..a4cfa6efdfe0062ef7f089a0660826e1ae80ef1a 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -139,7 +139,7 @@ enum {
 #define DNS_EDE_MAX_ERRORS   3
 #define DNS_EDNS_MAX_OPTIONS DNS_OPT_COUNT + DNS_EDE_MAX_ERRORS
 
-#define DNS_MESSAGE_REPLYPRESERVE       (DNS_MESSAGEFLAG_RD | DNS_MESSAGEFLAG_CD)
+#define DNS_MESSAGE_REPLYPRESERVE (DNS_MESSAGEFLAG_RD | DNS_MESSAGEFLAG_CD)
 #define DNS_MESSAGEEXTFLAG_REPLYPRESERVE (DNS_MESSAGEEXTFLAG_DO)
 
 #define DNS_MESSAGE_HEADERLEN 12 /*%< 6 uint16_t's */

diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index 8466b581c45370e1661be000d0ca047e2d1ab47a..974f94aa2a382744c1b22a3d6225622eb7016a1e 100644 (file)
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -330,8 +330,8 @@ dns_sdlz_putrr_t dns_sdlz_putrr;
  */
 
 typedef isc_result_t
-                 dns_sdlz_putsoa_t(dns_sdlzlookup_t *lookup, const char *mname,
-                                   const char *rname, uint32_t serial);
+dns_sdlz_putsoa_t(dns_sdlzlookup_t *lookup, const char *mname,
+                 const char *rname, uint32_t serial);
 dns_sdlz_putsoa_t dns_sdlz_putsoa;
 /*%<
  * This function may optionally be called from the 'authority'

diff --git a/lib/dns/time.c b/lib/dns/time.c
index ec49f522e0a84b9bbce1736e5fa0e26a62d30db3..6b1e3343236e0ef1a825fbadb1c4d896ab2ae9f5 100644 (file)
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -41,8 +41,8 @@ dns_time64_totext(int64_t t, isc_buffer_t *target) {
 /*
  * Warning. Do NOT use arguments with side effects with these macros.
  */
-#define is_leap(y)      ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
-#define year_secs(y)    ((is_leap(y) ? 366 : 365) * 86400)
+#define is_leap(y)   ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
+#define year_secs(y) ((is_leap(y) ? 366 : 365) * 86400)
 #define month_secs(m, y) ((days[m] + ((m == 1 && is_leap(y)) ? 1 : 0)) * 86400)
 
        tm.tm_year = 70;

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 855ac052ce196c2bbd83a8a8a034ecc71cd88cbb..a459d1d1b0194f341a451a64ce7dd35aea2b3a65 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -588,7 +588,7 @@ typedef enum {
        DNS_ZONEFLG___MAX = UINT64_MAX, /* trick to make the ENUM 64-bit wide */
 } dns_zoneflg_t;
 
-#define DNS_ZONE_OPTION(z, o)   ((atomic_load_relaxed(&(z)->options) & (o)) != 0)
+#define DNS_ZONE_OPTION(z, o) ((atomic_load_relaxed(&(z)->options) & (o)) != 0)
 #define DNS_ZONE_SETOPTION(z, o) atomic_fetch_or(&(z)->options, (o))
 #define DNS_ZONE_CLROPTION(z, o) atomic_fetch_and(&(z)->options, ~(o))
 

diff --git a/lib/isc/include/isc/queue.h b/lib/isc/include/isc/queue.h
index a2abe24c15b50981935ee17ec08276a849e7d052..02f94d866de18b6ba8c6ddad4c2b7d61324c27ad 100644 (file)
--- a/lib/isc/include/isc/queue.h
+++ b/lib/isc/include/isc/queue.h
@@ -21,10 +21,10 @@ STATIC_ASSERT(sizeof(struct __cds_wfcq_head) <= ISC_OS_CACHELINE_SIZE,
 typedef struct isc_queue {
        struct __cds_wfcq_head head;
        uint8_t                __padding_head[ISC_OS_CACHELINE_SIZE -
-                                     sizeof(struct __cds_wfcq_head)];
+                                             sizeof(struct __cds_wfcq_head)];
        struct cds_wfcq_tail   tail;
        uint8_t                __padding_tail[ISC_OS_CACHELINE_SIZE -
-                                     sizeof(struct __cds_wfcq_head)];
+                                             sizeof(struct __cds_wfcq_head)];
 } isc_queue_t;
 
 typedef struct cds_wfcq_node isc_queue_node_t;

diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index da5b3465c19f013ca2074e17573089c5a709b3e5..6137cd43a279fc6aef21cadd9799217cfb40d3ee 100644 (file)
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -64,7 +64,7 @@ struct isc_quota {
        struct {
                struct cds_wfcq_head head;
                uint8_t              __padding[ISC_OS_CACHELINE_SIZE -
-                                      sizeof(struct __cds_wfcq_head)];
+                                              sizeof(struct __cds_wfcq_head)];
                struct cds_wfcq_tail tail;
        } jobs;
        ISC_LINK(isc_quota_t) link;

diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h
index 77763ff5056f0e2a38eda40b4909e184bf26f58e..cce815ad44665dc3004f7c42fb6d6019bc820405 100644 (file)
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -202,7 +202,7 @@ typedef atomic_uint_fast32_t isc_refcount_t;
                __attribute__((unused));                                    \
        stat void name##_detach(name##_t **ptrp) __attribute__((unused))
 
-#define ISC_REFCOUNT_DECL(name)               ISC__REFCOUNT_DECL(name, ISC_REFCOUNT_BLANK)
+#define ISC_REFCOUNT_DECL(name) ISC__REFCOUNT_DECL(name, ISC_REFCOUNT_BLANK)
 #define ISC_REFCOUNT_STATIC_DECL(name) ISC__REFCOUNT_DECL(name, static inline)
 
 #define ISC__REFCOUNT_IMPL(name, destroy, stat)                      \

diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h
index 41d52b54b0ab4bfdb25428502306e47a7b50a455..f4360211af5554435add46455245d641f5ca368b 100644 (file)
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -256,8 +256,8 @@ struct ns_client {
 #define NS_CLIENTATTR_WANTNSID  0x000020 /*%< include nameserver ID */
 #define NS_CLIENTATTR_BADCOOKIE \
        0x000040 /*%< Presented cookie is bad/out-of-date */
-#define NS_CLIENTATTR_WANTRC         0x000080 /*%< include Report-Channel */
-#define NS_CLIENTATTR_WANTAD         0x000100 /*%< want AD in response if possible */
+#define NS_CLIENTATTR_WANTRC 0x000080 /*%< include Report-Channel */
+#define NS_CLIENTATTR_WANTAD 0x000100 /*%< want AD in response if possible */
 #define NS_CLIENTATTR_WANTCOOKIE      0x000200 /*%< return a COOKIE */
 #define NS_CLIENTATTR_HAVECOOKIE      0x000400 /*%< has a valid COOKIE */
 #define NS_CLIENTATTR_WANTEXPIRE      0x000800 /*%< return seconds to expire */

diff --git a/tests/isc/file_test.c b/tests/isc/file_test.c
index c569dbd9cdc7d418395c9f3dda0a619274697b5d..414d1fed031e0e7e3cd1a68f7eeaf13ad45f0300 100644 (file)
--- a/tests/isc/file_test.c
+++ b/tests/isc/file_test.c
@@ -31,8 +31,8 @@
 
 #include <tests/isc.h>
 
-#define NAME     "internal"
-#define SHA      "3bed2cb3a3acf7b6a8ef408420cc682d5520e26976d354254f528c965612054f"
+#define NAME "internal"
+#define SHA  "3bed2cb3a3acf7b6a8ef408420cc682d5520e26976d354254f528c965612054f"
 #define TRUNC_SHA "3bed2cb3a3acf7b6"
 
 #define BAD1    "in/internal"