Use clang-format-22 to update formatting

(cherry picked from commit 239464f27643bf609e9c0ad79ab2d597ccbb2280)

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index ff8074fc17898bb6bd0dfcf364adf81975ce3997..4a7662ea0cc0e9f174c42d741dc03936a71863f6 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 488ce4ff6e0903530c76491afd95269f4fad10b6..00471556cb3842796ba4e9964ce2c4755aa7ffbb 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -416,11 +416,11 @@ 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_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_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 a3ad4ba2ad75b29f338dd3e3ea2b1190c0c5d87a..e2bae5d9c217c4c73d2a0e6ccef726eac563ba0a 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -133,7 +133,7 @@
  */
 #define DNS_EDNSOPTIONS 7 + 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 b0388b98cfbe49219ebec44af97abb47ac0c449e..2ba66e7ed5b5dfce9d6e32e3a073c97c25dcaae2 100644 (file)
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -332,8 +332,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 ae23ce0a991ff680630c6b3ecfde056f0c1f16ea..dc1db73fb226867a8a00ff41c714514b8ac80f8f 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 2079168fe3806b0f76940525aacd9d23e1663b6e..40b0e1fdade7cf1ae7ca75d61e7fddecba715c63 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -571,7 +571,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/overflow.h b/lib/isc/include/isc/overflow.h
index c272cfa8793cd037b24bff57816cc611ccae721e..70c9169533f7ebd65b122b1959dae0da0ea4e4c0 100644 (file)
--- a/lib/isc/include/isc/overflow.h
+++ b/lib/isc/include/isc/overflow.h
@@ -89,7 +89,7 @@
        ({                                                        \
                size_t _d;                                        \
                bool   _overflow = ISC_OVERFLOW_MUL(a, b, &_d) || \
-                                ISC_OVERFLOW_ADD(_d, c, &_d);    \
+                                  ISC_OVERFLOW_ADD(_d, c, &_d);  \
                INSIST(!_overflow);                               \
                _d;                                               \
        })

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 5597b9fda12af7522e6abb74962456c72b720450..ff0c281aa75c008bf71da3e05512fbfead459871 100644 (file)
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -67,7 +67,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 82f5796bd601d8f3ae3d541a8dd1b19e58710053..81c5bc79a4ccc0f705af32f95fd83ae2e00719f9 100644 (file)
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -201,7 +201,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 440febcc05926cc7c188260ead3e740a27fe04a1..e813897d2f3878e2e0b8e5cc66a4aea7604cadfa 100644 (file)
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -248,14 +248,14 @@ struct ns_client {
 #define NS_CLIENTATTR_BADCOOKIE \
        0x00040 /*%< Presented cookie is bad/out-of-date */
 /* Obsolete: NS_CLIENTATTR_FILTER_AAAA_RC 0x00080 */
-#define NS_CLIENTATTR_WANTAD      0x00100 /*%< want AD in response if possible */
-#define NS_CLIENTATTR_WANTCOOKIE   0x00200 /*%< return a COOKIE */
-#define NS_CLIENTATTR_HAVECOOKIE   0x00400 /*%< has a valid COOKIE */
-#define NS_CLIENTATTR_WANTEXPIRE   0x00800 /*%< return seconds to expire */
-#define NS_CLIENTATTR_HAVEEXPIRE   0x01000 /*%< return seconds to expire */
-#define NS_CLIENTATTR_WANTOPT     0x02000 /*%< add opt to reply */
-#define NS_CLIENTATTR_HAVEECS     0x04000 /*%< received an ECS option */
-#define NS_CLIENTATTR_WANTPAD     0x08000 /*%< pad reply */
+#define NS_CLIENTATTR_WANTAD    0x00100 /*%< want AD in response if possible */
+#define NS_CLIENTATTR_WANTCOOKIE 0x00200 /*%< return a COOKIE */
+#define NS_CLIENTATTR_HAVECOOKIE 0x00400 /*%< has a valid COOKIE */
+#define NS_CLIENTATTR_WANTEXPIRE 0x00800 /*%< return seconds to expire */
+#define NS_CLIENTATTR_HAVEEXPIRE 0x01000 /*%< return seconds to expire */
+#define NS_CLIENTATTR_WANTOPT   0x02000 /*%< add opt to reply */
+#define NS_CLIENTATTR_HAVEECS   0x04000 /*%< received an ECS option */
+#define NS_CLIENTATTR_WANTPAD   0x08000 /*%< pad reply */
 #define NS_CLIENTATTR_USEKEEPALIVE 0x10000 /*%< use TCP keepalive */
 
 #define NS_CLIENTATTR_NOSETFC 0x20000 /*%< don't set servfail cache */

diff --git a/tests/isc/file_test.c b/tests/isc/file_test.c
index 6b75ba24905173186143ac8c3e267f4258389d27..03c401409eb8f7deca2134cdfd1eef19ac71b6ea 100644 (file)
--- a/tests/isc/file_test.c
+++ b/tests/isc/file_test.c
@@ -30,8 +30,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"