Update the source code formatting using clang-format-12

clang-format now tries to keep the type-cast on the same line as the
variable.  Update the formatting.

diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index 331b870dbfbd90c04b971a10facaf9bb3aa01d4f..cf89ae115eb0b75d463e1414c3d817479fc29d17 100644 (file)
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -96,10 +96,11 @@ typedef uint64_t dns_rpz_zbits_t;
  * Mask of the specified and higher numbered policy zones
  * Avoid hassles with (1<<33) or (1<<65)
  */
-#define DNS_RPZ_ZMASK(n)                                                     \
-       ((dns_rpz_zbits_t)(                                                  \
-               (((n) >= DNS_RPZ_MAX_ZONES - 1) ? 0 : (1ULL << ((n) + 1))) - \
-               1))
+#define DNS_RPZ_ZMASK(n)                                     \
+       ((dns_rpz_zbits_t)((((n) >= DNS_RPZ_MAX_ZONES - 1)   \
+                                   ? 0                      \
+                                   : (1ULL << ((n) + 1))) - \
+                          1))
 
 /*
  * The trigger counter type.

diff --git a/lib/dns/message.c b/lib/dns/message.c
index 8f3efab6ec7dd9915f56ffb04513655fdef5ad03..ad21bb17b99a798ce9eda1a2c67f2aa2011bf578 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1578,9 +1578,9 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
                        msg->opt = rdataset;
                        rdataset = NULL;
                        free_rdataset = false;
-                       ercode = (dns_rcode_t)(
-                               (msg->opt->ttl & DNS_MESSAGE_EDNSRCODE_MASK) >>
-                               20);
+                       ercode = (dns_rcode_t)((msg->opt->ttl &
+                                               DNS_MESSAGE_EDNSRCODE_MASK) >>
+                                              20);
                        msg->rcode |= ercode;
                        dns_message_puttempname(msg, &name);
                        free_name = false;

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 7e8552ed06ec626df79d4dfa8709952251d9e26a..b7b9a4326f569a37457374e393a68ddbbb46b098 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -6848,8 +6848,10 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 
                if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
                        RDATASET_ATTR_SET(newheader, RDATASET_ATTR_RESIGN);
-                       newheader->resign = (isc_stdtime_t)(
-                               dns_time64_from32(rdataset->resign) >> 1);
+                       newheader->resign =
+                               (isc_stdtime_t)(dns_time64_from32(
+                                                       rdataset->resign) >>
+                                               1);
                        newheader->resign_lsb = rdataset->resign & 0x1;
                } else {
                        newheader->resign = 0;
@@ -7058,8 +7060,9 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
        newheader->node = rbtnode;
        if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
                RDATASET_ATTR_SET(newheader, RDATASET_ATTR_RESIGN);
-               newheader->resign = (isc_stdtime_t)(
-                       dns_time64_from32(rdataset->resign) >> 1);
+               newheader->resign =
+                       (isc_stdtime_t)(dns_time64_from32(rdataset->resign) >>
+                                       1);
                newheader->resign_lsb = rdataset->resign & 0x1;
        } else {
                newheader->resign = 0;
@@ -7468,8 +7471,9 @@ loading_addrdataset(void *arg, const dns_name_t *name,
 
        if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
                RDATASET_ATTR_SET(newheader, RDATASET_ATTR_RESIGN);
-               newheader->resign = (isc_stdtime_t)(
-                       dns_time64_from32(rdataset->resign) >> 1);
+               newheader->resign =
+                       (isc_stdtime_t)(dns_time64_from32(rdataset->resign) >>
+                                       1);
                newheader->resign_lsb = rdataset->resign & 0x1;
        } else {
                newheader->resign = 0;

diff --git a/lib/isc/include/isc/stdatomic.h b/lib/isc/include/isc/stdatomic.h
index f6a87fb2aeb044efb83b04c6a0caffde75e63791..a4465c2f73b47b39afca1108b1cee796088d5eaf 100644 (file)
--- a/lib/isc/include/isc/stdatomic.h
+++ b/lib/isc/include/isc/stdatomic.h
@@ -185,10 +185,10 @@ typedef uintmax_t    atomic_uintmax_t;
                                                fail)                         \
        ({                                                                    \
                __typeof__(obj) __v;                                          \
-               _Bool __r;                                                    \
+               _Bool           __r;                                          \
                __v = (__typeof__(obj))__sync_val_compare_and_swap(           \
                        obj, *(expected), desired);                           \
-               __r = ((__typeof__(obj)) * (expected) == __v);                \
+               __r = ((__typeof__(obj))*(expected) == __v);                  \
                *(expected) = __v;                                            \
                __r;                                                          \
        })