From: Mark Andrews <marka@isc.org>
Date: Wed, 9 Aug 2023 01:43:36 +0000 (+1000)
Subject: Fix clang formatting
X-Git-Tag: v9.19.17~58^2~2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d527ae11c9b3af9fa31991d4c4fcadfd84cf4930;p=thirdparty%2Fbind9.git

Fix clang formatting
---

diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
index 49988792485..0778d907956 100644
--- a/lib/dns/dst_parse.c
+++ b/lib/dns/dst_parse.c
@@ -233,8 +233,7 @@ check_ecdsa(const dst_private_t *priv, bool external) {
 
 	mask = (1ULL << TAG_SHIFT) - 1;
 
-	ok = have[TAG_ECDSA_LABEL & mask] ||
-	     have[TAG_ECDSA_PRIVATEKEY & mask];
+	ok = have[TAG_ECDSA_LABEL & mask] || have[TAG_ECDSA_PRIVATEKEY & mask];
 
 	return (ok ? 0 : -1);
 }
@@ -267,8 +266,7 @@ check_eddsa(const dst_private_t *priv, bool external) {
 
 	mask = (1ULL << TAG_SHIFT) - 1;
 
-	ok = have[TAG_EDDSA_LABEL & mask] ||
-	     have[TAG_EDDSA_PRIVATEKEY & mask];
+	ok = have[TAG_EDDSA_LABEL & mask] || have[TAG_EDDSA_PRIVATEKEY & mask];
 
 	return (ok ? 0 : -1);
 }
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 2aef28b9305..005e7832d32 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -272,8 +272,9 @@ err:
 }
 
 static isc_result_t
-dst__openssl_fromlabel_provider(int key_base_id, const char *label, const char *pin,
-				EVP_PKEY **ppub, EVP_PKEY **ppriv) {
+dst__openssl_fromlabel_provider(int key_base_id, const char *label,
+				const char *pin, EVP_PKEY **ppub,
+				EVP_PKEY **ppriv) {
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 	isc_result_t ret = DST_R_OPENSSLFAILURE;
 	OSSL_STORE_CTX *ctx = NULL;
@@ -336,8 +337,8 @@ isc_result_t
 dst__openssl_fromlabel(int key_base_id, const char *engine, const char *label,
 		       const char *pin, EVP_PKEY **ppub, EVP_PKEY **ppriv) {
 	if (engine == NULL) {
-		return (dst__openssl_fromlabel_provider(key_base_id, label,
-						        pin, ppub, ppriv));
+		return (dst__openssl_fromlabel_provider(key_base_id, label, pin,
+							ppub, ppriv));
 	}
 
 	return (dst__openssl_fromlabel_engine(key_base_id, engine, label, pin,