From a3c10ad7d110bacab7e448f2317324131f9a08a2 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 9 Jun 2025 17:48:49 +0200 Subject: [PATCH 1/5] Update Clang to version 20 (cherry picked from commit 31922536c05a69a7ee60e9bd4aa015232c062b15) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2423253d80..e46e0cdd46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: TEST_PARALLEL_JOBS: 4 CONFIGURE: ./configure - CLANG_VERSION: 19 + CLANG_VERSION: 20 CLANG: "clang-${CLANG_VERSION}" SCAN_BUILD: "scan-build-${CLANG_VERSION}" LLVM_SYMBOLIZER: "/usr/lib/llvm-${CLANG_VERSION}/bin/llvm-symbolizer" From e70a976958ce1bccd55c84be88f9688ad3a018e6 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Jun 2025 12:01:31 +1000 Subject: [PATCH 2/5] Preserve brackets in DNS_SLABHEADER_GETATTR macro We need to turn off clang-format to preserve the brackets as 'attribute' can be an expression and we need it to be evaluated first. Similarly we need the entire result to be evaluated independent of the adjoining code. (cherry picked from commit 3620db5ea6f163199cf5a3ad09c32d02b374f748) --- lib/dns/include/dns/rdataslab.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h index 3061f0ece4..8fc68322ca 100644 --- a/lib/dns/include/dns/rdataslab.h +++ b/lib/dns/include/dns/rdataslab.h @@ -154,8 +154,10 @@ enum { DNS_SLABHEADERATTR_STALE_WINDOW = 1 << 13, }; +/* clang-format off : RemoveParentheses */ #define DNS_SLABHEADER_GETATTR(header, attribute) \ - (atomic_load_acquire(&(header)->attributes) & attribute) + (atomic_load_acquire(&(header)->attributes) & (attribute)) +/* clang-format on */ #define DNS_SLABHEADER_SETATTR(header, attribute) \ atomic_fetch_or_release(&(header)->attributes, attribute) #define DNS_SLABHEADER_CLRATTR(header, attribute) \ From 072f5d00099e221f7704d00d650bd653be064f8b Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Jun 2025 12:49:04 +1000 Subject: [PATCH 3/5] Preserve brackets around string concatenation We need disable clang-format here to preserve the brackets around the string concatenation to prevent -Wstring-concatenation -Werror breaking the build. (cherry picked from commit eeafcee7ad07ae793602a3640b7f05d3cb26ff9f) --- tests/dns/private_test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/dns/private_test.c b/tests/dns/private_test.c index a7c5a291eb..f65408bdd0 100644 --- a/tests/dns/private_test.c +++ b/tests/dns/private_test.c @@ -190,8 +190,10 @@ ISC_RUN_TEST_IMPL(private_nsec3_totext) { const char *results[] = { "Creating NSEC3 chain 1 0 1 BEEF", "Creating NSEC3 chain 1 1 10 DADD", "Pending NSEC3 chain 1 0 20 BEAD", + /* clang-format off */ ("Removing NSEC3 chain 1 0 30 DEAF / " "creating NSEC chain"), + /* clang-format on */ "Removing NSEC3 chain 1 0 100 FEEDABEE" }; int ncases = 5; From 53738b0e5e0037b7ac8d06e146832d972e2e46d5 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Jun 2025 12:39:17 +1000 Subject: [PATCH 4/5] Use clang-format-20 to update formatting (cherry picked from commit 422b9118e878d3106c84b2eac44371f7143f320b) --- bin/delv/delv.c | 2 +- bin/dig/dig.c | 2 +- bin/dnssec/dnssec-keygen.c | 8 ++--- bin/dnssec/dnssec-ksr.c | 6 ++-- bin/named/dlz_dlopen_driver.c | 4 +-- bin/named/server.c | 10 +++--- bin/tests/system/rpz/testlib/dummylib.c | 15 +++++---- bin/tests/system/rpz/testlib/test-data.c | 16 +++++----- lib/dns/adb.c | 10 +++--- lib/dns/byaddr.c | 8 ++--- lib/dns/dispatch.c | 4 +-- lib/dns/dnssec.c | 20 ++++++------ lib/dns/include/dns/librpz.h | 21 +++++++------ lib/dns/keymgr.c | 15 +++++---- lib/dns/message.c | 2 +- lib/dns/nsec3.c | 6 ++-- lib/dns/qpcache.c | 7 +++-- lib/dns/rbt-cachedb.c | 7 +++-- lib/dns/rdata.c | 2 +- lib/dns/rdata/generic/opt_41.c | 2 +- lib/dns/rdataset.c | 2 +- lib/dns/rdataslab.c | 11 +++---- lib/dns/resolver.c | 2 +- lib/dns/rrl.c | 10 +++--- lib/dns/stats.c | 22 ++++++------- lib/dns/ttl.c | 10 +++--- lib/dns/zone.c | 39 ++++++++++++------------ lib/isc/netmgr/proxyudp.c | 2 +- lib/isc/proxy2.c | 4 +-- lib/isc/radix.c | 2 +- lib/isc/result.c | 6 ++-- lib/isccfg/kaspconf.c | 2 +- lib/isccfg/parser.c | 6 ++-- lib/ns/client.c | 4 +-- lib/ns/query.c | 2 +- tests/bench/qpmulti.c | 2 +- tests/dns/dst_test.c | 4 +-- tests/dns/name_test.c | 4 +-- tests/dns/skr_test.c | 6 ++-- tests/isc/crc64_test.c | 2 +- tests/isc/hmac_test.c | 2 +- tests/isc/md_test.c | 2 +- tests/isc/netmgr_common.c | 6 ++-- 43 files changed, 158 insertions(+), 161 deletions(-) diff --git a/bin/delv/delv.c b/bin/delv/delv.c index ee413bccb7..041f4b65ca 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -407,7 +407,7 @@ print_status(dns_rdataset_t *rdataset) { if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) { strlcat(buf, "negative response", sizeof(buf)); - strlcat(buf, (yaml ? "_" : ", "), sizeof(buf)); + strlcat(buf, yaml ? "_" : ", ", sizeof(buf)); } switch (rdataset->trust) { diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 0d6f9fb707..9eac6cd88c 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -2787,7 +2787,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, printgreeting(argc, argv, *lookup); *firstarg = false; } - ISC_LIST_APPEND(lookup_list, (*lookup), link); + ISC_LIST_APPEND(lookup_list, *lookup, link); debug("looking up %s", (*lookup)->textname); } return value_from_next; diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 1b1be2c8aa..e70b7ed632 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -433,10 +433,10 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) { fatal("-S and -G cannot be used together"); } - ret = dst_key_fromnamedfile( - ctx->predecessor, ctx->directory, - (DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE), - mctx, &prevkey); + ret = dst_key_fromnamedfile(ctx->predecessor, ctx->directory, + DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | + DST_TYPE_STATE, + mctx, &prevkey); if (ret != ISC_R_SUCCESS) { fatal("Invalid keyfile %s: %s", ctx->predecessor, isc_result_totext(ret)); diff --git a/bin/dnssec/dnssec-ksr.c b/bin/dnssec/dnssec-ksr.c index ac12cd5b3b..8471398431 100644 --- a/bin/dnssec/dnssec-ksr.c +++ b/bin/dnssec/dnssec-ksr.c @@ -496,11 +496,11 @@ create_key(ksr_ctx_t *ksr, dns_kasp_t *kasp, dns_kasp_key_t *kaspkey, dst_key_setbool(key, DST_BOOL_KSK, ksr->ksk); dst_key_setbool(key, DST_BOOL_ZSK, !ksr->ksk); dst_key_settime(key, DST_TIME_CREATED, ksr->now); - dst_key_settime(key, DST_TIME_PUBLISH, (active - prepub)); + dst_key_settime(key, DST_TIME_PUBLISH, active - prepub); dst_key_settime(key, DST_TIME_ACTIVATE, active); if (ksr->ksk) { dns_keymgr_settime_syncpublish(key, kasp, - (inception == ksr->start)); + inception == ksr->start); } if (ksr->lifetime > 0) { @@ -516,7 +516,7 @@ create_key(ksr_ctx_t *ksr, dns_kasp_t *kasp, dns_kasp_key_t *kaspkey, ksr->retiresafety + ksr->signdelay; } dst_key_settime(key, DST_TIME_INACTIVE, inactive); - dst_key_settime(key, DST_TIME_DELETE, (inactive + remove)); + dst_key_settime(key, DST_TIME_DELETE, inactive + remove); *expiration = inactive; } else { *expiration = 0; diff --git a/bin/named/dlz_dlopen_driver.c b/bin/named/dlz_dlopen_driver.c index 7df54351da..e2c9f0de29 100644 --- a/bin/named/dlz_dlopen_driver.c +++ b/bin/named/dlz_dlopen_driver.c @@ -268,13 +268,13 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], cd->dlz_allowzonexfr = (dlz_dlopen_allowzonexfr_t *)dl_load_symbol( cd, "dlz_allowzonexfr", false); cd->dlz_allnodes = (dlz_dlopen_allnodes_t *)dl_load_symbol( - cd, "dlz_allnodes", (cd->dlz_allowzonexfr != NULL)); + cd, "dlz_allnodes", cd->dlz_allowzonexfr != NULL); cd->dlz_authority = (dlz_dlopen_authority_t *)dl_load_symbol( cd, "dlz_authority", false); cd->dlz_newversion = (dlz_dlopen_newversion_t *)dl_load_symbol( cd, "dlz_newversion", false); cd->dlz_closeversion = (dlz_dlopen_closeversion_t *)dl_load_symbol( - cd, "dlz_closeversion", (cd->dlz_newversion != NULL)); + cd, "dlz_closeversion", cd->dlz_newversion != NULL); cd->dlz_configure = (dlz_dlopen_configure_t *)dl_load_symbol( cd, "dlz_configure", false); cd->dlz_ssumatch = (dlz_dlopen_ssumatch_t *)dl_load_symbol( diff --git a/bin/named/server.c b/bin/named/server.c index b3f1b38766..f01d14b3aa 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -4862,12 +4862,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, /* * Resolver. */ - CHECK(get_view_querysource_dispatch( - maps, AF_INET, &dispatch4, - (ISC_LIST_PREV(view, link) == NULL))); - CHECK(get_view_querysource_dispatch( - maps, AF_INET6, &dispatch6, - (ISC_LIST_PREV(view, link) == NULL))); + CHECK(get_view_querysource_dispatch(maps, AF_INET, &dispatch4, + ISC_LIST_PREV(view, link) == NULL)); + CHECK(get_view_querysource_dispatch(maps, AF_INET6, &dispatch6, + ISC_LIST_PREV(view, link) == NULL)); if (dispatch4 == NULL && dispatch6 == NULL) { UNEXPECTED_ERROR("unable to obtain either an IPv4 or" " an IPv6 dispatch"); diff --git a/bin/tests/system/rpz/testlib/dummylib.c b/bin/tests/system/rpz/testlib/dummylib.c index 03b91b6537..56a829d3ce 100644 --- a/bin/tests/system/rpz/testlib/dummylib.c +++ b/bin/tests/system/rpz/testlib/dummylib.c @@ -593,9 +593,8 @@ get_cstr_zones(const char *cstr, trpz_rsp_t *trsp, size_t *pnzones) { } if (trsp->num_zones > old_zct) { - result = realloc(result, - ((trsp->num_zones + 1) * - sizeof(*result))); + result = realloc(result, (trsp->num_zones + + 1) * sizeof(*result)); if (result == NULL) { perror("realloc"); exit(EXIT_FAILURE); @@ -878,7 +877,7 @@ trpz_rsp_push(librpz_emsg_t *emsg, librpz_rsp_t *rsp) { } memmove(&(trsp->rstack[1]), &(trsp->rstack[0]), - (trsp->stack_idx * sizeof(trsp->rstack[0]))); + trsp->stack_idx * sizeof(trsp->rstack[0])); trsp->stack_idx++; return true; @@ -895,7 +894,7 @@ trpz_rsp_pop(librpz_emsg_t *emsg, librpz_result_t *result, librpz_rsp_t *rsp) { } memmove(&(trsp->rstack[0]), &(trsp->rstack[1]), - ((trsp->stack_idx - 1) * sizeof(trsp->rstack[0]))); + (trsp->stack_idx - 1) * sizeof(trsp->rstack[0])); memmove(result, &(trsp->rstack[0].result), sizeof(*result)); trsp->stack_idx--; @@ -916,7 +915,7 @@ trpz_rsp_pop_discard(librpz_emsg_t *emsg, librpz_rsp_t *rsp) { if (trsp->stack_idx > 1) { memmove(&(trsp->rstack[1]), &(trsp->rstack[2]), - ((trsp->stack_idx - 2) * sizeof(trsp->rstack[0]))); + (trsp->stack_idx - 2) * sizeof(trsp->rstack[0])); } trsp->stack_idx--; @@ -1144,7 +1143,7 @@ domain_cmp(const char *query, const char *record, bool *wildp) { qptr = query + strlen(query) - (cmplen - 2); - if (strncmp(qptr, rptr, (cmplen - 2)) == 0) { + if (strncmp(qptr, rptr, cmplen - 2) == 0) { *wildp = true; return 0; } @@ -1259,7 +1258,7 @@ result_supercedes_address(const trpz_result_t *new, const trpz_result_t *old) { return false; } - if ((new->flags &NODE_FLAG_IPV6_ADDRESS) && + if ((new->flags & NODE_FLAG_IPV6_ADDRESS) && !(old->flags & NODE_FLAG_IPV6_ADDRESS)) { return true; diff --git a/bin/tests/system/rpz/testlib/test-data.c b/bin/tests/system/rpz/testlib/test-data.c index 591ecdbd0e..8ccebd6579 100644 --- a/bin/tests/system/rpz/testlib/test-data.c +++ b/bin/tests/system/rpz/testlib/test-data.c @@ -169,7 +169,7 @@ get_address_info(const char *astr, int *pfamily, char *pbuf, *errp = str_printf( "invalid rpz IP address \"%s\"; " "invalid prefix length of %u", - (optname ? optname : astr), prefix); + optname ? optname : astr, prefix); } return -1; @@ -187,7 +187,7 @@ get_address_info(const char *astr, int *pfamily, char *pbuf, *errp = str_printf( "invalid rpz IP address \"%s\"; " "invalid prefix length of %u", - (optname ? optname : astr), prefix); + optname ? optname : astr, prefix); } return -1; @@ -358,7 +358,7 @@ apply_update_to_set(trpz_result_t **results, size_t *pnresults, /* No match. Instead, append. */ (*pnresults)++; - *results = realloc(*results, (*pnresults * sizeof(**results))); + *results = realloc(*results, *pnresults * sizeof(**results)); if (*results == NULL) { perror("realloc"); return NULL; @@ -507,7 +507,7 @@ add_other_rr(trpz_result_t *node, const char *rrtype, const char *val, node->nrrs++; - node->rrs = realloc(node->rrs, (node->nrrs * sizeof(*(node->rrs)))); + node->rrs = realloc(node->rrs, node->nrrs * sizeof(*(node->rrs))); if (node->rrs == NULL) { perror("realloc"); exit(EXIT_FAILURE); @@ -544,11 +544,11 @@ reverse_labels(const char *str, char *pbuf) { } if (sptr == str) { - strncat(pbuf, sptr, (end - sptr)); + strncat(pbuf, sptr, end - sptr); break; } - strncat(pbuf, sptr + 1, (end - (sptr + 1))); + strncat(pbuf, sptr + 1, end - (sptr + 1)); strcat(pbuf, "."); end = sptr--; } @@ -800,7 +800,7 @@ apply_update(const char *updstr, trpz_result_t **presults, size_t *pnresults, (*pnzones)++; - *pzones = realloc(*pzones, (*pnzones * sizeof(**pzones))); + *pzones = realloc(*pzones, *pnzones * sizeof(**pzones)); if (*pzones == NULL) { perror("realloc"); exit(EXIT_FAILURE); @@ -1009,7 +1009,7 @@ apply_update(const char *updstr, trpz_result_t **presults, size_t *pnresults, /* A special case of PASSTHRU (with trailing characters) */ if (nend != NULL && (strlen(databuf) == (size_t)(nend - nodebuf)) && - !strncmp(databuf, nodebuf, (nend - nodebuf))) + !strncmp(databuf, nodebuf, nend - nodebuf)) { policy = LIBRPZ_POLICY_PASSTHRU; } diff --git a/lib/dns/adb.c b/lib/dns/adb.c index a9bf009a80..5d31afe439 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -2670,11 +2670,11 @@ dbfind_name(dns_adbname_t *adbname, isc_stdtime_t now, dns_rdatatype_t rdtype) { * any matching static-stub zone without looking into the cache to honor * the configuration on which server we should send queries to. */ - result = - dns_view_find(adb->view, adbname->name, rdtype, now, - DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK, true, - ((adbname->flags & DNS_ADBFIND_STARTATZONE) != 0), - NULL, NULL, fname, &rdataset, NULL); + result = dns_view_find(adb->view, adbname->name, rdtype, now, + DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK, + true, + (adbname->flags & DNS_ADBFIND_STARTATZONE) != 0, + NULL, NULL, fname, &rdataset, NULL); switch (result) { case DNS_R_GLUE: diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c index a0a83c9ec4..a5612fa748 100644 --- a/lib/dns/byaddr.c +++ b/lib/dns/byaddr.c @@ -57,10 +57,10 @@ dns_byaddr_createptrname(const isc_netaddr_t *address, dns_name_t *name) { if (address->family == AF_INET) { (void)snprintf(textname, sizeof(textname), "%u.%u.%u.%u.in-addr.arpa.", - ((unsigned int)bytes[3] & 0xffU), - ((unsigned int)bytes[2] & 0xffU), - ((unsigned int)bytes[1] & 0xffU), - ((unsigned int)bytes[0] & 0xffU)); + (unsigned int)bytes[3] & 0xffU, + (unsigned int)bytes[2] & 0xffU, + (unsigned int)bytes[1] & 0xffU, + (unsigned int)bytes[0] & 0xffU); } else if (address->family == AF_INET6) { size_t remaining; diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 2c70cae019..a31ad8833e 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -564,7 +564,7 @@ udp_recv(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region, dispentry_log(resp, ISC_LOG_DEBUG(92), "got valid DNS message header, /QR %c, id %u", - (((flags & DNS_MESSAGEFLAG_QR) != 0) ? '1' : '0'), id); + ((flags & DNS_MESSAGEFLAG_QR) != 0) ? '1' : '0', id); /* * Look at the message flags. If it's a query, ignore it. @@ -668,7 +668,7 @@ tcp_recv_success(dns_dispatch_t *disp, isc_region_t *region, dispatch_log(disp, ISC_LOG_DEBUG(92), "got valid DNS message header, /QR %c, id %u", - (((flags & DNS_MESSAGEFLAG_QR) != 0) ? '1' : '0'), id); + ((flags & DNS_MESSAGEFLAG_QR) != 0) ? '1' : '0', id); /* * Look at the message flags. If it's a query, ignore it and keep diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index f33c36c9d1..8b5d2338a1 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -1572,7 +1572,7 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, dns_kasp_t *kasp, /* Try to read the public key. */ result = keyfromfile(kasp, directory, dnskey, - (DST_TYPE_PUBLIC | DST_TYPE_STATE), mctx, + DST_TYPE_PUBLIC | DST_TYPE_STATE, mctx, &pubkey); if (result == ISC_R_FILENOTFOUND || result == ISC_R_NOPERM) { result = ISC_R_SUCCESS; @@ -1587,10 +1587,10 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, dns_kasp_t *kasp, } /* Now read the private key. */ - result = keyfromfile( - kasp, directory, dnskey, - (DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE), - mctx, &privkey); + result = keyfromfile(kasp, directory, dnskey, + DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | + DST_TYPE_STATE, + mctx, &privkey); /* * If the key was revoked and the private file @@ -1604,9 +1604,9 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, dns_kasp_t *kasp, dst_key_setflags(dnskey, flags & ~DNS_KEYFLAG_REVOKE); result = keyfromfile(kasp, directory, dnskey, - (DST_TYPE_PUBLIC | - DST_TYPE_PRIVATE | - DST_TYPE_STATE), + DST_TYPE_PUBLIC | + DST_TYPE_PRIVATE | + DST_TYPE_STATE, mctx, &privkey); if (result == ISC_R_SUCCESS && dst_key_pubcompare(dnskey, privkey, false)) @@ -1628,8 +1628,8 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, dns_kasp_t *kasp, result2 = dst_key_getfilename( dst_key_name(dnskey), dst_key_id(dnskey), dst_key_alg(dnskey), - (DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | - DST_TYPE_STATE), + DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | + DST_TYPE_STATE, NULL, mctx, &buf); if (result2 != ISC_R_SUCCESS) { char namebuf[DNS_NAME_FORMATSIZE]; diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h index 9c28e86675..d8eb795003 100644 --- a/lib/dns/include/dns/librpz.h +++ b/lib/dns/include/dns/librpz.h @@ -367,7 +367,7 @@ typedef struct librpz_client librpz_client_t; * @param mutex: pointer to the lock for the client handle * @param log_ctx: NULL or resolver's context log messages */ -typedef librpz_clist_t *(librpz_clist_create_t)(librpz_emsg_t *emsg, +typedef librpz_clist_t *(librpz_clist_create_t)(librpz_emsg_t * emsg, librpz_mutex_t *lock, librpz_mutex_t *unlock, librpz_mutex_t *mutex_destroy, @@ -388,7 +388,7 @@ LIBDEF_F(clist_detach) * @param use_expired: true to not ignore expired zones * @return client handle or NULL if the handle could not be created */ -typedef librpz_client_t *(librpz_client_create_t)(librpz_emsg_t *emsg, +typedef librpz_client_t *(librpz_client_create_t)(librpz_emsg_t * emsg, librpz_clist_t *clist, const char *cstr, bool use_expired); @@ -649,8 +649,8 @@ LIBDEF_F(zone_refresh) * @param client context * @return malloc'ed string or NULL after error */ -typedef char *(librpz_db_info_t)(librpz_emsg_t *emsg, bool license, bool cfiles, - bool listens, librpz_rsp_t *rsp); +typedef char *(librpz_db_info_t)(librpz_emsg_t * emsg, bool license, + bool cfiles, bool listens, librpz_rsp_t *rsp); LIBDEF_F(db_info) /** @@ -670,7 +670,7 @@ LIBDEF_F(itr_start) * @param rsp state from librpz_itr_start() * @return malloc'ed string or NULL after error */ -typedef char *(librpz_mf_stats_t)(librpz_emsg_t *emsg, librpz_rsp_t *rsp); +typedef char *(librpz_mf_stats_t)(librpz_emsg_t * emsg, librpz_rsp_t *rsp); LIBDEF_F(mf_stats) /** @@ -679,7 +679,7 @@ LIBDEF_F(mf_stats) * @param[in,out] rsp: state from librpz_itr_start() * @return malloc'ed string or NULL after error */ -typedef char *(librpz_vers_stats_t)(librpz_emsg_t *emsg, librpz_rsp_t *rsp); +typedef char *(librpz_vers_stats_t)(librpz_emsg_t * emsg, librpz_rsp_t *rsp); LIBDEF_F(vers_stats) /** @@ -689,7 +689,7 @@ LIBDEF_F(vers_stats) * @param[in,out] rsp state from librpz_rsp_start() * @return malloc'ed string or NULL after error */ -typedef char *(librpz_itr_zone_t)(librpz_emsg_t *emsg, bool all_zones, +typedef char *(librpz_itr_zone_t)(librpz_emsg_t * emsg, bool all_zones, librpz_rsp_t *rsp); LIBDEF_F(itr_zone) @@ -756,11 +756,12 @@ typedef int(librpz_domain_pton2_t)(const char *src, u_char *dst, size_t dstsiz, LIBDEF_F(domain_pton2) typedef union socku socku_t; -typedef socku_t *(librpz_mk_inet_su_t)(socku_t *su, const struct in_addr *addrp, - in_port_t port); +typedef socku_t *(librpz_mk_inet_su_t)(socku_t * su, + const struct in_addr *addrp, + in_port_t port); LIBDEF_F(mk_inet_su) -typedef socku_t *(librpz_mk_inet6_su_t)(socku_t *su, +typedef socku_t *(librpz_mk_inet6_su_t)(socku_t * su, const struct in6_addr *addrp, uint32_t scope_id, in_port_t port); LIBDEF_F(mk_inet6_su) diff --git a/lib/dns/keymgr.c b/lib/dns/keymgr.c index 185806a85b..abb762aa1b 100644 --- a/lib/dns/keymgr.c +++ b/lib/dns/keymgr.c @@ -201,7 +201,7 @@ dns_keymgr_settime_syncpublish(dst_key_t *key, dns_kasp_t *kasp, bool first) { ret = dst_key_getnum(key, DST_NUM_LIFETIME, &lifetime); if (ret == ISC_R_SUCCESS && lifetime > 0) { dst_key_settime(key, DST_TIME_SYNCDELETE, - (syncpublish + lifetime)); + syncpublish + lifetime); } } @@ -298,7 +298,7 @@ keymgr_prepublication_time(dns_dnsseckey_t *key, dns_kasp_t *kasp, syncpub); if (klifetime > 0) { dst_key_settime(key->key, DST_TIME_SYNCDELETE, - (syncpub + klifetime)); + syncpub + klifetime); } } } @@ -1640,12 +1640,12 @@ keymgr_key_init(dns_dnsseckey_t *key, dns_kasp_t *kasp, isc_stdtime_t now, ret = dst_key_getbool(key->key, DST_BOOL_KSK, &ksk); if (ret != ISC_R_SUCCESS) { ksk = ((dst_key_flags(key->key) & DNS_KEYFLAG_KSK) != 0); - dst_key_setbool(key->key, DST_BOOL_KSK, (ksk || csk)); + dst_key_setbool(key->key, DST_BOOL_KSK, ksk || csk); } ret = dst_key_getbool(key->key, DST_BOOL_ZSK, &zsk); if (ret != ISC_R_SUCCESS) { zsk = ((dst_key_flags(key->key) & DNS_KEYFLAG_KSK) == 0); - dst_key_setbool(key->key, DST_BOOL_ZSK, (zsk || csk)); + dst_key_setbool(key->key, DST_BOOL_ZSK, zsk || csk); } /* Get time metadata. */ @@ -1772,7 +1772,7 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key, "DNSKEY %s (%s) (policy %s) in %u " "seconds", keystr, keymgr_keyrole(active_key->key), - dns_kasp_getname(kasp), (prepub - now)); + dns_kasp_getname(kasp), prepub - now); } } if (prepub == 0 || prepub > now) { @@ -2125,7 +2125,7 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, { bool found_match = false; - keymgr_key_init(dkey, kasp, now, (numkeys == 1)); + keymgr_key_init(dkey, kasp, now, numkeys == 1); for (kkey = ISC_LIST_HEAD(dns_kasp_keys(kasp)); kkey != NULL; kkey = ISC_LIST_NEXT(kkey, link)) @@ -2520,8 +2520,7 @@ rollover_status(dns_dnsseckey_t *dkey, dns_kasp_t *kasp, isc_stdtime_t now, "scheduled on ")); retire_time = keymgr_prepublication_time( dkey, kasp, - (retire_time - active_time), - now); + retire_time - active_time, now); } else { RETERR(isc_buffer_printf( buf, " Key will retire on ")); diff --git a/lib/dns/message.c b/lib/dns/message.c index 6e77144663..56b9578810 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -68,7 +68,7 @@ hexdump(const char *msg, const char *msg2, void *base, size_t len) { } else if (cnt % 8 == 0) { printf(" |"); } - printf(" %02x %c", *p, (isprint(*p) ? *p : ' ')); + printf(" %02x %c", *p, isprint(*p) ? *p : ' '); p++; cnt++; diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index 470dddf4da..b46dab7130 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -2178,9 +2178,9 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, *optout = ((nsec3.flags & DNS_NSEC3FLAG_OPTOUT) != 0); (*logit)(arg, ISC_LOG_DEBUG(3), - (*optout ? "NSEC3 indicates optout" - : "NSEC3 indicates secure " - "range")); + *optout ? "NSEC3 indicates optout" + : "NSEC3 indicates secure " + "range"); } answer = ISC_R_SUCCESS; } diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c index 0309a5bbff..00f8534213 100644 --- a/lib/dns/qpcache.c +++ b/lib/dns/qpcache.c @@ -510,9 +510,10 @@ static atomic_uint_fast16_t init_count = 0; */ static bool need_headerupdate(dns_slabheader_t *header, isc_stdtime_t now) { - if (DNS_SLABHEADER_GETATTR(header, (DNS_SLABHEADERATTR_NONEXISTENT | - DNS_SLABHEADERATTR_ANCIENT | - DNS_SLABHEADERATTR_ZEROTTL)) != 0) + if (DNS_SLABHEADER_GETATTR(header, + DNS_SLABHEADERATTR_NONEXISTENT | + DNS_SLABHEADERATTR_ANCIENT | + DNS_SLABHEADERATTR_ZEROTTL) != 0) { return false; } diff --git a/lib/dns/rbt-cachedb.c b/lib/dns/rbt-cachedb.c index 7a77739869..2494273cc9 100644 --- a/lib/dns/rbt-cachedb.c +++ b/lib/dns/rbt-cachedb.c @@ -140,9 +140,10 @@ */ static bool need_headerupdate(dns_slabheader_t *header, isc_stdtime_t now) { - if (DNS_SLABHEADER_GETATTR(header, (DNS_SLABHEADERATTR_NONEXISTENT | - DNS_SLABHEADERATTR_ANCIENT | - DNS_SLABHEADERATTR_ZEROTTL)) != 0) + if (DNS_SLABHEADER_GETATTR(header, + DNS_SLABHEADERATTR_NONEXISTENT | + DNS_SLABHEADERATTR_ANCIENT | + DNS_SLABHEADERATTR_ZEROTTL) != 0) { return false; } diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index dd1e990251..a877c96104 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -2601,7 +2601,7 @@ svcb_hashttp(isc_textregion_t *alpn) { s = alpn->base; } } - if (svcb_ishttp(s, (alpn->base - s))) { + if (svcb_ishttp(s, alpn->base - s)) { return true; } } diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c index faaeac2453..f7c4f75668 100644 --- a/lib/dns/rdata/generic/opt_41.c +++ b/lib/dns/rdata/generic/opt_41.c @@ -44,7 +44,7 @@ fromtext_opt(ARGS_FROMTEXT) { static isc_result_t totext_opt(ARGS_TOTEXT) { isc_region_t r; - isc_region_t or ; + isc_region_t or; uint16_t option; uint16_t length; char buf[sizeof("64000 64000")]; diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index 123cceb3ef..1118e1531d 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -663,7 +663,7 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, * If we accept expired RRsets keep them for no more than 120 seconds. */ if (acceptexpired && - (isc_serial_le(rrsig->timeexpire, ((now + 120) & 0xffffffff)) || + (isc_serial_le(rrsig->timeexpire, (now + 120) & 0xffffffff) || isc_serial_le(rrsig->timeexpire, now))) { ttl = 120; diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c index 74de47ab90..dd891f22b3 100644 --- a/lib/dns/rdataslab.c +++ b/lib/dns/rdataslab.c @@ -668,7 +668,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, */ tcurrent += (tcount * 4); - offsettable = isc_mem_cget(mctx, (ocount + oncount), + offsettable = isc_mem_cget(mctx, ocount + oncount, sizeof(unsigned int)); #endif /* if DNS_RDATASET_FIXED */ @@ -773,8 +773,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, #if DNS_RDATASET_FIXED fillin_offsets(offsetbase, offsettable, ocount + oncount); - isc_mem_cput(mctx, offsettable, (ocount + oncount), - sizeof(unsigned int)); + isc_mem_cput(mctx, offsettable, ocount + oncount, sizeof(unsigned int)); #endif /* if DNS_RDATASET_FIXED */ INSIST(tcurrent == tstart + tlength); @@ -1072,8 +1071,8 @@ void dns_slabheader_copycase(dns_slabheader_t *dest, dns_slabheader_t *src) { if (CASESET(src)) { uint_least16_t attr = DNS_SLABHEADER_GETATTR( - src, (DNS_SLABHEADERATTR_CASESET | - DNS_SLABHEADERATTR_CASEFULLYLOWER)); + src, DNS_SLABHEADERATTR_CASESET | + DNS_SLABHEADERATTR_CASEFULLYLOWER); DNS_SLABHEADER_SETATTR(dest, attr); memmove(dest->upper, src->upper, sizeof(src->upper)); } @@ -1090,7 +1089,7 @@ dns_slabheader_reset(dns_slabheader_t *h, dns_db_t *db, dns_dbnode_t *node) { atomic_init(&h->attributes, 0); atomic_init(&h->last_refresh_fail_ts, 0); - STATIC_ASSERT((sizeof(h->attributes) == 2), + STATIC_ASSERT(sizeof(h->attributes) == 2, "The .attributes field of dns_slabheader_t needs to be " "16-bit int type exactly."); } diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index ddaa7e8d88..eacd2dbebf 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -7717,7 +7717,7 @@ resquery_response_continue(void *arg, isc_result_t result) { /* * Clear cache bits. */ - FCTX_ATTR_CLR(fctx, (FCTX_ATTR_WANTNCACHE | FCTX_ATTR_WANTCACHE)); + FCTX_ATTR_CLR(fctx, FCTX_ATTR_WANTNCACHE | FCTX_ATTR_WANTCACHE); /* * Did we get any answers? diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c index de2c3a3672..4a6de0144a 100644 --- a/lib/dns/rrl.c +++ b/lib/dns/rrl.c @@ -238,7 +238,7 @@ expand_entries(dns_rrl_t *rrl, int newsize) { } bsize = sizeof(dns_rrl_block_t) + - ISC_CHECKED_MUL((newsize - 1), sizeof(dns_rrl_entry_t)); + ISC_CHECKED_MUL(newsize - 1, sizeof(dns_rrl_entry_t)); b = isc_mem_cget(rrl->mctx, 1, bsize); b->size = bsize; @@ -277,7 +277,7 @@ free_old_hash(dns_rrl_t *rrl) { isc_mem_put(rrl->mctx, old_hash, sizeof(*old_hash) + - ISC_CHECKED_MUL((old_hash->length - 1), + ISC_CHECKED_MUL(old_hash->length - 1, sizeof(old_hash->bins[0]))); rrl->old_hash = NULL; } @@ -304,7 +304,7 @@ expand_rrl_hash(dns_rrl_t *rrl, isc_stdtime_t now) { new_bins = hash_divisor(new_bins); hsize = sizeof(dns_rrl_hash_t) + - ISC_CHECKED_MUL((new_bins - 1), sizeof(hash->bins[0])); + ISC_CHECKED_MUL(new_bins - 1, sizeof(hash->bins[0])); hash = isc_mem_cget(rrl->mctx, 1, hsize); hash->length = new_bins; rrl->hash_gen ^= 1; @@ -1302,14 +1302,14 @@ dns_rrl_view_destroy(dns_view_t *view) { h = rrl->hash; if (h != NULL) { isc_mem_put(rrl->mctx, h, - sizeof(*h) + ISC_CHECKED_MUL((h->length - 1), + sizeof(*h) + ISC_CHECKED_MUL(h->length - 1, sizeof(h->bins[0]))); } h = rrl->old_hash; if (h != NULL) { isc_mem_put(rrl->mctx, h, - sizeof(*h) + ISC_CHECKED_MUL((h->length - 1), + sizeof(*h) + ISC_CHECKED_MUL(h->length - 1, sizeof(h->bins[0]))); } diff --git a/lib/dns/stats.c b/lib/dns/stats.c index 8721a650ca..975761c630 100644 --- a/lib/dns/stats.c +++ b/lib/dns/stats.c @@ -196,7 +196,7 @@ dns_rdatatypestats_create(isc_mem_t *mctx, dns_stats_t **statsp) { * Create rdtype statistics for the first 255 RRtypes, * plus one additional for other RRtypes. */ - create_stats(mctx, dns_statstype_rdtype, (RDTYPECOUNTER_MAXTYPE + 1), + create_stats(mctx, dns_statstype_rdtype, RDTYPECOUNTER_MAXTYPE + 1, statsp); } @@ -204,7 +204,7 @@ void dns_rdatasetstats_create(isc_mem_t *mctx, dns_stats_t **statsp) { REQUIRE(statsp != NULL && *statsp == NULL); - create_stats(mctx, dns_statstype_rdataset, (RDTYPECOUNTER_MAXVAL + 1), + create_stats(mctx, dns_statstype_rdataset, RDTYPECOUNTER_MAXVAL + 1, statsp); } @@ -366,7 +366,7 @@ dns_dnssecsignstats_increment(dns_stats_t *stats, dns_keytag_t id, uint8_t alg, uint32_t counter = isc_stats_get_counter(stats->counters, idx); if (counter == kval) { /* Match */ - isc_stats_increment(stats->counters, (idx + operation)); + isc_stats_increment(stats->counters, idx + operation); return; } } @@ -377,23 +377,23 @@ dns_dnssecsignstats_increment(dns_stats_t *stats, dns_keytag_t id, uint8_t alg, uint32_t counter = isc_stats_get_counter(stats->counters, idx); if (counter == 0) { isc_stats_set(stats->counters, kval, idx); - isc_stats_increment(stats->counters, (idx + operation)); + isc_stats_increment(stats->counters, idx + operation); return; } } /* No room, grow stats storage. */ isc_stats_resize(&stats->counters, - (num_keys * dnssecsign_block_size * 2)); + num_keys * dnssecsign_block_size * 2); /* Reset counters for new key (new index, nidx). */ int nidx = num_keys * dnssecsign_block_size; isc_stats_set(stats->counters, kval, nidx); - isc_stats_set(stats->counters, 0, (nidx + dns_dnssecsignstats_sign)); - isc_stats_set(stats->counters, 0, (nidx + dns_dnssecsignstats_refresh)); + isc_stats_set(stats->counters, 0, nidx + dns_dnssecsignstats_sign); + isc_stats_set(stats->counters, 0, nidx + dns_dnssecsignstats_refresh); /* And increment the counter for the given operation. */ - isc_stats_increment(stats->counters, (nidx + operation)); + isc_stats_increment(stats->counters, nidx + operation); } void @@ -416,9 +416,9 @@ dns_dnssecsignstats_clear(dns_stats_t *stats, dns_keytag_t id, uint8_t alg) { /* Match */ isc_stats_set(stats->counters, 0, idx); isc_stats_set(stats->counters, 0, - (idx + dns_dnssecsignstats_sign)); + idx + dns_dnssecsignstats_sign); isc_stats_set(stats->counters, 0, - (idx + dns_dnssecsignstats_refresh)); + idx + dns_dnssecsignstats_refresh); return; } } @@ -545,7 +545,7 @@ dnssec_statsdump(isc_stats_t *stats, dnssecsignstats_type_t operation, continue; } - val = isc_stats_get_counter(stats, (idx + operation)); + val = isc_stats_get_counter(stats, idx + operation); if ((options & ISC_STATSDUMP_VERBOSE) == 0 && val == 0) { continue; } diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index e36adef6e4..4605abb068 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -89,23 +89,23 @@ dns_ttl_totext(uint32_t src, bool verbose, bool upcase, isc_buffer_t *target) { x = 0; if (weeks != 0) { - RETERR(ttlfmt(weeks, "week", verbose, (x > 0), target)); + RETERR(ttlfmt(weeks, "week", verbose, x > 0, target)); x++; } if (days != 0) { - RETERR(ttlfmt(days, "day", verbose, (x > 0), target)); + RETERR(ttlfmt(days, "day", verbose, x > 0, target)); x++; } if (hours != 0) { - RETERR(ttlfmt(hours, "hour", verbose, (x > 0), target)); + RETERR(ttlfmt(hours, "hour", verbose, x > 0, target)); x++; } if (mins != 0) { - RETERR(ttlfmt(mins, "minute", verbose, (x > 0), target)); + RETERR(ttlfmt(mins, "minute", verbose, x > 0, target)); x++; } if (secs != 0 || (weeks == 0 && days == 0 && hours == 0 && mins == 0)) { - RETERR(ttlfmt(secs, "second", verbose, (x > 0), target)); + RETERR(ttlfmt(secs, "second", verbose, x > 0, target)); x++; } INSIST(x > 0); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 4ff40f192f..d6245793cc 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -1566,7 +1566,7 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) { REQUIRE(argv != NULL && *argv == NULL); LOCK_ZONE(zone); - size = ISC_CHECKED_MUL((zone->db_argc + 1), sizeof(char *)); + size = ISC_CHECKED_MUL(zone->db_argc + 1, sizeof(char *)); for (i = 0; i < zone->db_argc; i++) { size += strlen(zone->db_argv[i]) + 1; } @@ -1575,7 +1575,7 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) { tmp = mem; tmp2 = mem; base = mem; - tmp2 += ISC_CHECKED_MUL((zone->db_argc + 1), sizeof(char *)); + tmp2 += ISC_CHECKED_MUL(zone->db_argc + 1, sizeof(char *)); for (i = 0; i < zone->db_argc; i++) { *tmp++ = tmp2; strlcpy(tmp2, zone->db_argv[i], size - (tmp2 - base)); @@ -4268,7 +4268,7 @@ load_secroots(dns_zone_t *zone, dns_name_t *name, dns_rdataset_t *rdataset) { /* Add to keytables. */ trusted++; - trust_key(zone, name, &dnskey, (keydata.addhd == 0)); + trust_key(zone, name, &dnskey, keydata.addhd == 0); } if (trusted == 0 && pending != 0) { @@ -4446,7 +4446,7 @@ add_soa(dns_zone_t *zone, dns_db_t *db) { failure: dns_diff_clear(&diff); if (ver != NULL) { - dns_db_closeversion(db, &ver, (result == ISC_R_SUCCESS)); + dns_db_closeversion(db, &ver, result == ISC_R_SUCCESS); } INSIST(ver == NULL); @@ -6183,7 +6183,7 @@ keyfromfile(dns_zone_t *zone, dst_key_t *pubkey, isc_mem_t *mctx, result = dst_key_fromfile( dst_key_name(pubkey), dst_key_id(pubkey), dst_key_alg(pubkey), - (DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE), + DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE, directory, mctx, &foundkey); } else { for (dns_kasp_key_t *kkey = ISC_LIST_HEAD(dns_kasp_keys(kasp)); @@ -6196,8 +6196,8 @@ keyfromfile(dns_zone_t *zone, dst_key_t *pubkey, isc_mem_t *mctx, result = dst_key_fromfile( dst_key_name(pubkey), dst_key_id(pubkey), dst_key_alg(pubkey), - (DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | - DST_TYPE_STATE), + DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | + DST_TYPE_STATE, directory, mctx, &foundkey); if (result == ISC_R_SUCCESS) { break; @@ -6279,8 +6279,8 @@ findzonekeys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, result2 = dst_key_getfilename( dst_key_name(pubkey), dst_key_id(pubkey), dst_key_alg(pubkey), - (DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | - DST_TYPE_STATE), + DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | + DST_TYPE_STATE, NULL, mctx, &buf); if (result2 != ISC_R_SUCCESS) { char namebuf[DNS_NAME_FORMATSIZE]; @@ -6696,8 +6696,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, if (!dns_rdatatype_iskeymaterial(type)) { bool warn = false, deleted = false; - if (delsig_ok(&rrsig, keys, nkeys, (kasp != NULL), - &warn)) + if (delsig_ok(&rrsig, keys, nkeys, kasp != NULL, &warn)) { result = update_one_rr(db, ver, zonediff->diff, DNS_DIFFOP_DELRESIGN, @@ -15999,8 +15998,8 @@ dns_zone_logv(dns_zone_t *zone, isc_logcategory_t *category, int level, } isc_log_write(dns_lctx, category, DNS_LOGMODULE_ZONE, level, - "%s%s%s%s: %s", (prefix != NULL ? prefix : ""), - (prefix != NULL ? ": " : ""), zstr, zone->strnamerd, + "%s%s%s%s: %s", prefix != NULL ? prefix : "", + prefix != NULL ? ": " : "", zstr, zone->strnamerd, message); } @@ -16267,7 +16266,7 @@ fail: addrbuf, isc_result_totext(result)); notify->flags |= DNS_NOTIFY_TCP; dns_request_destroy(¬ify->request); - notify_send_queue(notify, (notify->flags & DNS_NOTIFY_STARTUP)); + notify_send_queue(notify, notify->flags & DNS_NOTIFY_STARTUP); return; } else if (result == ISC_R_TIMEDOUT) { notify_log(notify->zone, ISC_LOG_WARNING, @@ -19929,9 +19928,9 @@ dns_zone_setdialup(dns_zone_t *zone, dns_dialuptype_t dialup) { case dns_dialuptype_no: break; case dns_dialuptype_yes: - DNS_ZONE_SETFLAG(zone, (DNS_ZONEFLG_DIALNOTIFY | - DNS_ZONEFLG_DIALREFRESH | - DNS_ZONEFLG_NOREFRESH)); + DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_DIALNOTIFY | + DNS_ZONEFLG_DIALREFRESH | + DNS_ZONEFLG_NOREFRESH); break; case dns_dialuptype_notify: DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_DIALNOTIFY); @@ -22755,7 +22754,7 @@ zone_rekey(dns_zone_t *zone) { CHECK(dns_diff_apply(&diff, db, ver)); CHECK(clean_nsec3param(zone, db, ver, &diff)); CHECK(add_signing_records(db, zone->privatetype, ver, - &diff, (newalg || fullsign))); + &diff, newalg || fullsign)); CHECK(update_soa_serial(zone, db, ver, &diff, mctx, zone->updatemethod)); CHECK(add_chains(zone, db, ver, &diff)); @@ -23704,7 +23703,7 @@ dns_zone_keydone(dns_zone_t *zone, const char *keystr) { isc_buffer_init(&b, kd->data, sizeof(kd->data)); isc_buffer_putuint8(&b, alg); isc_buffer_putuint8(&b, (keyid & 0xff00) >> 8); - isc_buffer_putuint8(&b, (keyid & 0xff)); + isc_buffer_putuint8(&b, keyid & 0xff); isc_buffer_putuint8(&b, 0); isc_buffer_putuint8(&b, 1); } @@ -24472,7 +24471,7 @@ setserial(void *arg) { "setserial: desired serial (%u) " "out of range (%u-%u)", desired, oldserial + 1, - (oldserial + 0x7fffffff)); + oldserial + 0x7fffffff); } goto failure; } diff --git a/lib/isc/netmgr/proxyudp.c b/lib/isc/netmgr/proxyudp.c index 725f873460..8fea367683 100644 --- a/lib/isc/netmgr/proxyudp.c +++ b/lib/isc/netmgr/proxyudp.c @@ -869,7 +869,7 @@ isc__nm_proxyudp_send(isc_nmhandle_t *handle, isc_region_t *region, } send_req = proxyudp_get_send_req(sock->worker->mctx, sock, handle, - (sock->client ? region : NULL), cb, + sock->client ? region : NULL, cb, cbarg); if (sock->client) { isc_region_t send_data = { 0 }; diff --git a/lib/isc/proxy2.c b/lib/isc/proxy2.c index ccf386bd26..7837b65528 100644 --- a/lib/isc/proxy2.c +++ b/lib/isc/proxy2.c @@ -1336,7 +1336,7 @@ isc_proxy2_header_append_tlv(isc_buffer_t *restrict outbuf, } append_type_and_length(outbuf, (uint8_t)tlv_type, - ((uint16_t)tlv_data->length), true); + (uint16_t)tlv_data->length, true); if (tlv_data->length > 0) { isc_result_t result = isc_proxy2_header_append(outbuf, @@ -1413,7 +1413,7 @@ isc_proxy2_append_tlv(isc_buffer_t *restrict outbuf, const uint8_t type, return ISC_R_RANGE; } - append_type_and_length(outbuf, (uint8_t)type, ((uint16_t)data->length), + append_type_and_length(outbuf, (uint8_t)type, (uint16_t)data->length, false); if (data->length > 0) { diff --git a/lib/isc/radix.c b/lib/isc/radix.c index ba3c875b71..31cceed1b0 100644 --- a/lib/isc/radix.c +++ b/lib/isc/radix.c @@ -392,7 +392,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, } /* I know the better way, but for now. */ for (j = 0; j < 8; j++) { - if (BIT_TEST(r, (0x80 >> j))) { + if (BIT_TEST(r, 0x80 >> j)) { break; } } diff --git a/lib/isc/result.c b/lib/isc/result.c index 6efdfabe25..d2e7b6189c 100644 --- a/lib/isc/result.c +++ b/lib/isc/result.c @@ -529,13 +529,13 @@ static const char *identifier[ISC_R_NRESULTS] = { [ISCCC_R_MAXDEPTH] = "ISCCC_R_MAXDEPTH", }; -STATIC_ASSERT((DNS_R_SERVFAIL - DNS_R_NOERROR == 2), +STATIC_ASSERT(DNS_R_SERVFAIL - DNS_R_NOERROR == 2, "DNS_R_NOERROR has wrong value"); -STATIC_ASSERT((DNS_R_BADVERS - DNS_R_NOERROR == 16), +STATIC_ASSERT(DNS_R_BADVERS - DNS_R_NOERROR == 16, "DNS_R_BADVERS has wrong value"); -STATIC_ASSERT((ISC_R_NRESULTS < INT32_MAX), "result.h enum too big"); +STATIC_ASSERT(ISC_R_NRESULTS < INT32_MAX, "result.h enum too big"); const char * isc_result_totext(isc_result_t result) { diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c index 920525e109..3a37536149 100644 --- a/lib/isccfg/kaspconf.c +++ b/lib/isccfg/kaspconf.c @@ -766,7 +766,7 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, dns_kasp_t *default_kasp, if (default_kasp != NULL && dns_kasp_nsec3(default_kasp)) { dns_kasp_setnsec3param( kasp, dns_kasp_nsec3iter(default_kasp), - (dns_kasp_nsec3flags(default_kasp) == 0x01), + dns_kasp_nsec3flags(default_kasp) == 0x01, dns_kasp_nsec3saltlen(default_kasp)); } else { dns_kasp_setnsec3(kasp, false); diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index b6a346bf92..76b22efbdd 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -539,9 +539,9 @@ cfg_parser_create(isc_mem_t *mctx, isc_log_t *lctx, cfg_parser_t **ret) { isc_lex_create(pctx->mctx, 1024, &pctx->lexer); isc_lex_setspecials(pctx->lexer, specials); - isc_lex_setcomments(pctx->lexer, - (ISC_LEXCOMMENT_C | ISC_LEXCOMMENT_CPLUSPLUS | - ISC_LEXCOMMENT_SHELL)); + isc_lex_setcomments(pctx->lexer, ISC_LEXCOMMENT_C | + ISC_LEXCOMMENT_CPLUSPLUS | + ISC_LEXCOMMENT_SHELL); CHECK(cfg_create_list(pctx, &cfg_type_filelist, &pctx->open_files)); CHECK(cfg_create_list(pctx, &cfg_type_filelist, &pctx->closed_files)); diff --git a/lib/ns/client.c b/lib/ns/client.c index f2b9bbbfb1..15a4c9c480 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -1340,8 +1340,8 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { if (alwaysvalid) { now = when; } - if (isc_serial_gt(when, (now + 300)) /* In the future. */ || - isc_serial_lt(when, (now - 3600)) /* In the past. */) + if (isc_serial_gt(when, now + 300) /* In the future. */ || + isc_serial_lt(when, now - 3600) /* In the past. */) { client->attributes |= NS_CLIENTATTR_BADCOOKIE; ns_stats_increment(client->manager->sctx->nsstats, diff --git a/lib/ns/query.c b/lib/ns/query.c index 662ae1df32..ed13b11a13 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -4653,7 +4653,7 @@ cleanup: #ifdef USE_DNSRPS if (st->popt.dnsrps_enabled && st->m.policy != DNS_RPZ_POLICY_ERROR && !dnsrps_set_p(&emsg, client, st, qtype, &rdataset, - (qresult_type != qresult_type_recurse))) + qresult_type != qresult_type_recurse)) { rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, NULL, DNS_RPZ_TYPE_BAD, emsg.c, DNS_R_SERVFAIL); diff --git a/tests/bench/qpmulti.c b/tests/bench/qpmulti.c index b8451a4fb5..6e24828dcf 100644 --- a/tests/bench/qpmulti.c +++ b/tests/bench/qpmulti.c @@ -762,7 +762,7 @@ collect(void *varg) { nloops = zipf ? bctx->nloops : bctx->readers + bctx->mutate; for (uint32_t t = 0; t < nloops; t++) { struct thread_args *tp = &thread[t]; - elapsed = ISC_MAX(elapsed, (tp->stop - tp->start)); + elapsed = ISC_MAX(elapsed, tp->stop - tp->start); bool mut = t < bctx->mutate; stats[mut].worked += tp->worked; diff --git a/tests/dns/dst_test.c b/tests/dns/dst_test.c index 733843e764..3932241469 100644 --- a/tests/dns/dst_test.c +++ b/tests/dns/dst_test.c @@ -77,7 +77,7 @@ sig_fromfile(const char *path, isc_buffer_t *buf) { result = isc_file_getsizefd(fileno(fp), &size); assert_int_equal(result, ISC_R_SUCCESS); - data = isc_mem_get(mctx, (size + 1)); + data = isc_mem_get(mctx, size + 1); assert_non_null(data); len = (size_t)size; @@ -158,7 +158,7 @@ check_sig(const char *datapath, const char *sigpath, const char *keyname, result = isc_file_getsizefd(fileno(fp), &size); assert_int_equal(result, ISC_R_SUCCESS); - data = isc_mem_get(mctx, (size + 1)); + data = isc_mem_get(mctx, size + 1); assert_non_null(data); p = data; diff --git a/tests/dns/name_test.c b/tests/dns/name_test.c index da34c7b202..172b977708 100644 --- a/tests/dns/name_test.c +++ b/tests/dns/name_test.c @@ -702,7 +702,7 @@ ISC_RUN_TEST_IMPL(hash) { testcases[i].name2, h2); } - assert_int_equal((h1 == h2), testcases[i].expect); + assert_int_equal(h1 == h2, testcases[i].expect); /* Now case-sensitive */ h1 = dns_name_hash(n1); @@ -715,7 +715,7 @@ ISC_RUN_TEST_IMPL(hash) { testcases[i].name2, h2); } - assert_int_equal((h1 == h2), testcases[i].expect); + assert_int_equal(h1 == h2, testcases[i].expect); } } diff --git a/tests/dns/skr_test.c b/tests/dns/skr_test.c index 2143cf44c7..7230155b45 100644 --- a/tests/dns/skr_test.c +++ b/tests/dns/skr_test.c @@ -236,7 +236,7 @@ create_bundle(FILE *fp, isc_stdtime_t btime, int bnum) { ISC_LIST_APPEND(dnskeylist->rdata, &test_bundles[bnum].ksk, link); dns_rdatalist_tordataset(dnskeylist, dnskeyset); dns_rdata_init(&test_bundles[bnum].dnskey_rrsig); - sign_rrset(fp, btime, (btime + LIFETIME), dnskeyset, + sign_rrset(fp, btime, btime + LIFETIME, dnskeyset, test_bundles[bnum].rrsig1buf, &test_bundles[bnum].dnskey_rrsig); for (dns_rdata_t *rd = ISC_LIST_HEAD(dnskeylist->rdata); rd != NULL; @@ -263,7 +263,7 @@ create_bundle(FILE *fp, isc_stdtime_t btime, int bnum) { ISC_LIST_APPEND(cdnskeylist->rdata, &test_bundles[bnum].cdnskey, link); dns_rdatalist_tordataset(cdnskeylist, cdnskeyset); dns_rdata_init(&test_bundles[bnum].cdnskey_rrsig); - sign_rrset(fp, btime, (btime + LIFETIME), cdnskeyset, + sign_rrset(fp, btime, btime + LIFETIME, cdnskeyset, test_bundles[bnum].rrsig2buf, &test_bundles[bnum].cdnskey_rrsig); for (dns_rdata_t *rd = ISC_LIST_HEAD(cdnskeylist->rdata); rd != NULL; @@ -289,7 +289,7 @@ create_bundle(FILE *fp, isc_stdtime_t btime, int bnum) { ISC_LIST_APPEND(cdslist->rdata, &test_bundles[bnum].cds, link); dns_rdatalist_tordataset(cdslist, cdsset); dns_rdata_init(&test_bundles[bnum].cds_rrsig); - sign_rrset(fp, btime, (btime + LIFETIME), cdsset, + sign_rrset(fp, btime, btime + LIFETIME, cdsset, test_bundles[bnum].rrsig3buf, &test_bundles[bnum].cds_rrsig); for (dns_rdata_t *rd = ISC_LIST_HEAD(cdslist->rdata); rd != NULL; rd = ISC_LIST_HEAD(cdslist->rdata)) diff --git a/tests/isc/crc64_test.c b/tests/isc/crc64_test.c index a652dd5b01..e4c60da287 100644 --- a/tests/isc/crc64_test.c +++ b/tests/isc/crc64_test.c @@ -55,7 +55,7 @@ _crc64(const char *buf, size_t buflen, const char *result, const int repeats) { char hex[16 + 1]; snprintf(hex, sizeof(hex), "%016" PRIX64, crc); - assert_memory_equal(hex, result, (result ? strlen(result) : 0)); + assert_memory_equal(hex, result, result ? strlen(result) : 0); } /* 64-bit cyclic redundancy check */ diff --git a/tests/isc/hmac_test.c b/tests/isc/hmac_test.c index 5784a8aec1..0acea175b4 100644 --- a/tests/isc/hmac_test.c +++ b/tests/isc/hmac_test.c @@ -122,7 +122,7 @@ isc_hmac_test(isc_hmac_t *hmac_st, const void *key, size_t keylen, assert_return_code(res, ISC_R_SUCCESS); - assert_memory_equal(hexdigest, result, (result ? strlen(result) : 0)); + assert_memory_equal(hexdigest, result, result ? strlen(result) : 0); assert_int_equal(isc_hmac_reset(hmac_st), ISC_R_SUCCESS); } diff --git a/tests/isc/md_test.c b/tests/isc/md_test.c index 69051b93c9..c0ca995641 100644 --- a/tests/isc/md_test.c +++ b/tests/isc/md_test.c @@ -107,7 +107,7 @@ isc_md_test(isc_md_t *md, const isc_md_type_t *type, const char *buf, assert_return_code(res, ISC_R_SUCCESS); - assert_memory_equal(hexdigest, result, (result ? strlen(result) : 0)); + assert_memory_equal(hexdigest, result, result ? strlen(result) : 0); assert_int_equal(isc_md_reset(md), ISC_R_SUCCESS); } diff --git a/tests/isc/netmgr_common.c b/tests/isc/netmgr_common.c index 7372af4ab0..814e2fbff8 100644 --- a/tests/isc/netmgr_common.c +++ b/tests/isc/netmgr_common.c @@ -389,9 +389,9 @@ connect_connect_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) { do_cconnects_shutdown(loopmgr); } else if (do_send) { isc_async_current(stream_recv_send_connect, - (cbarg == NULL - ? get_stream_connect_function() - : (stream_connect_function)cbarg)); + cbarg == NULL + ? get_stream_connect_function() + : (stream_connect_function)cbarg); } isc_refcount_increment0(&active_creads); From 5f7ba5e1f97c92bcf098e3c99c7e867b89c2c495 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 19 Jun 2025 09:41:30 +1000 Subject: [PATCH 5/5] Ignore reformat sources with up-to-date clang-format-20 (cherry picked from commit d36b0f2b435222e3291d99bb3657411e29d25a63) --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7e7e29a9a9..195aadd442 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1548,3 +1548,5 @@ f2fa1b7d63100564dc55463a05bdeed893f83d86 c22176c0f9a71217be9bfab00573f8f0265499af # Remove redundant parentheses from the return statement 58a15d38c2c321fac75abef389a48ff82deaccf0 +# Reformat sources with up-to-date clang-format-20 +53738b0e5e0037b7ac8d06e146832d972e2e46d5