Address cppcheck reports regarding function pointer

cppcheck reports local address being returned with function
pointers that are not deferrenced

e.g.

	int
	function(int (*action)(int *)) {
		int local = 0;

		return ((action)(&local));
	}

replace with

		return ((*action)(&local));

diff --git a/lib/dns/name.c b/lib/dns/name.c
index 295a52718822f08f2433c71f517c5d8657c6013c..a9b814ee2317281dff11857d1f3c39dd1846c1fc 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -2315,7 +2315,7 @@ dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) {
 
        isc_buffer_usedregion(&buffer, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 bool

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index fa311094310af3710cee37d51a118f1e8e0973e4..71d04c5f1e0ee8713cc4fd26a8357a6d8c030918 100644 (file)
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -1051,9 +1051,9 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname,
                                                return (result);
                                        }
 
-                                       result = (callback)(current,
-                                                           callback_name,
-                                                           callback_arg);
+                                       result = (*callback)(current,
+                                                            callback_name,
+                                                            callback_arg);
                                        if (result != DNS_R_CONTINUE) {
                                                saved_result = result;
                                                /*

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 44e6ce45c01358bf10c5528df3ea15d4434b09b4..a5e7831b06a1337141a7afef935681a01b424efe 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1309,7 +1309,7 @@ dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
 
        if (use_default) {
                dns_rdata_toregion(rdata, &r);
-               result = (digest)(arg, &r);
+               result = (*digest)(arg, &r);
        }
 
        return (result);

diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c
index 7c5cad9e736990ed213958393c3b469b04108209..68c1e25666412594eca15e4ab5815de372e81d9b 100644 (file)
--- a/lib/dns/rdata/ch_3/a_1.c
+++ b/lib/dns/rdata/ch_3/a_1.c
@@ -281,7 +281,7 @@ digest_ch_a(ARGS_DIGEST) {
        dns_name_fromregion(&name, &r);
        isc_region_consume(&r, name_length(&name));
        RETERR(dns_name_digest(&name, digest, arg));
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 71c6ce61e545afbbdf015355f7053cfd8373f160..f7de42e4fb9d77c6aa7fdfb620c10f5a3309e507 100644 (file)
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -254,7 +254,7 @@ additionaldata_afsdb(ARGS_ADDLDATA) {
        isc_region_consume(&region, 2);
        dns_name_fromregion(&name, &region);
 
-       return ((add)(arg, &name, dns_rdatatype_a, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }
 
 static inline isc_result_t
@@ -268,7 +268,7 @@ digest_afsdb(ARGS_DIGEST) {
        r2 = r1;
        isc_region_consume(&r2, 2);
        r1.length = 2;
-       RETERR((digest)(arg, &r1));
+       RETERR((*digest)(arg, &r1));
        dns_name_init(&name, NULL);
        dns_name_fromregion(&name, &r2);
 

diff --git a/lib/dns/rdata/generic/amtrelay_260.c b/lib/dns/rdata/generic/amtrelay_260.c
index d68267e86f7e219d91e58bb2d1913ef58dde2549..0e1ab3ba535369b64a065f42e70d4d3afdae8203 100644 (file)
--- a/lib/dns/rdata/generic/amtrelay_260.c
+++ b/lib/dns/rdata/generic/amtrelay_260.c
@@ -409,7 +409,7 @@ digest_amtrelay(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_amtrelay);
 
        dns_rdata_toregion(rdata, &region);
-       return ((digest)(arg, &region));
+       return ((*digest)(arg, &region));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/avc_258.c b/lib/dns/rdata/generic/avc_258.c
index 5f3de214be4a93035f785be0077d8f2c36108d76..5de398428eb8ffab1d5811b8accc4bbdc77ecaa9 100644 (file)
--- a/lib/dns/rdata/generic/avc_258.c
+++ b/lib/dns/rdata/generic/avc_258.c
@@ -110,7 +110,7 @@ digest_avc(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/caa_257.c b/lib/dns/rdata/generic/caa_257.c
index b443aa7d13c54964f7f244c34beb1e6da8a119b0..767ac9654ab2631bad8dcb5e4f2d9e69f1c65cef 100644 (file)
--- a/lib/dns/rdata/generic/caa_257.c
+++ b/lib/dns/rdata/generic/caa_257.c
@@ -589,7 +589,7 @@ digest_caa(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/cdnskey_60.c b/lib/dns/rdata/generic/cdnskey_60.c
index 9eea7d6b8cf15efd18da3cbc44a424cd63cf720d..c90b028ca4d6f70f653347620838a05a0a683e2a 100644 (file)
--- a/lib/dns/rdata/generic/cdnskey_60.c
+++ b/lib/dns/rdata/generic/cdnskey_60.c
@@ -124,7 +124,7 @@ digest_cdnskey(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/cds_59.c b/lib/dns/rdata/generic/cds_59.c
index 26cc70d42761653961f59729f92879cbbf7bc6d1..0a56aa0dcf302422a7be0d83aa257219148cf6ad 100644 (file)
--- a/lib/dns/rdata/generic/cds_59.c
+++ b/lib/dns/rdata/generic/cds_59.c
@@ -131,7 +131,7 @@ digest_cds(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 34f5ef7c9f71be6c8895ed19866ebb0758d1f485..cbe7ea36b729f900436b3b092620daf792fb7636 100644 (file)
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -250,7 +250,7 @@ digest_cert(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/csync_62.c b/lib/dns/rdata/generic/csync_62.c
index eb41bcb640b551444509ecfd9bed8f26d1d8970e..06048b6f51585354af2f2340c610e9aff8799ed0 100644 (file)
--- a/lib/dns/rdata/generic/csync_62.c
+++ b/lib/dns/rdata/generic/csync_62.c
@@ -228,7 +228,7 @@ digest_csync(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_csync);
 
        dns_rdata_toregion(rdata, &r);
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c
index 21ae76df86d0b1bd3a2a7bfb9de96b5c300c0415..154605a6727ae8b77fce3e15282f043cc6768136 100644 (file)
--- a/lib/dns/rdata/generic/dlv_32769.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -127,7 +127,7 @@ digest_dlv(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index ca557bf59dbe99b422a44e42e23b0235a269ff94..906cf02f14d895c92435ccaf7f106bee2830ee0b 100644 (file)
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -125,7 +125,7 @@ digest_dnskey(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/doa_259.c b/lib/dns/rdata/generic/doa_259.c
index 5de79296c042a601285cbd178780e4fff1d8f69e..c256aec213dec5bad00aeb685c3a4eaeb75867fe 100644 (file)
--- a/lib/dns/rdata/generic/doa_259.c
+++ b/lib/dns/rdata/generic/doa_259.c
@@ -326,7 +326,7 @@ digest_doa(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index 0b91301c3152e46e6f8960a0bed8088debf9a6d0..d4a47378c6e46b36eac65818ab91525fa3fef306 100644 (file)
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -350,7 +350,7 @@ digest_ds(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/eui48_108.c b/lib/dns/rdata/generic/eui48_108.c
index 1a9820bbeeadcb345c6bd207a4977acfba995e1f..657b90865cef8226acb4881ab664db46f505d1f5 100644 (file)
--- a/lib/dns/rdata/generic/eui48_108.c
+++ b/lib/dns/rdata/generic/eui48_108.c
@@ -175,7 +175,7 @@ digest_eui48(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/eui64_109.c b/lib/dns/rdata/generic/eui64_109.c
index 50220c5199d7fdd68af653b8774a31cb272e8d8b..3ecc98ff72d78751fb4cb08e4d8b72dc4d8f718a 100644 (file)
--- a/lib/dns/rdata/generic/eui64_109.c
+++ b/lib/dns/rdata/generic/eui64_109.c
@@ -178,7 +178,7 @@ digest_eui64(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index 8bdfbdaae1a83d07579a288f0f50fdfafdfc0684..f8cb90ef3f9470d1086cc79c06c5e7aecfeff778 100644 (file)
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -220,7 +220,7 @@ digest_gpos(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index 98dbe1fd6273c0e06033cdc63d7d0dbb1190fb7a..b6e1438171f478e1680c8bb4bd3512fe72b241c9 100644 (file)
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -184,7 +184,7 @@ digest_hinfo(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c
index 6487c555a9940c84f930c91ade018b9fdf2ccb8b..59fa0aed9ed8c82e9f89fab09c478b304b81b602 100644 (file)
--- a/lib/dns/rdata/generic/hip_55.c
+++ b/lib/dns/rdata/generic/hip_55.c
@@ -395,7 +395,7 @@ digest_hip(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_hip);
 
        dns_rdata_toregion(rdata, &r);
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index f12c6dc48c0b3bae3a2d68f402181d2c99abcbb6..caf837fb0c955514e4df5251ce59195b64b4f61f 100644 (file)
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -454,7 +454,7 @@ digest_ipseckey(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_ipseckey);
 
        dns_rdata_toregion(rdata, &region);
-       return ((digest)(arg, &region));
+       return ((*digest)(arg, &region));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 3054590d7c49aef902a27e10ca463935986082a4..277ec13cd42acc3772cf9b72c7a11055dbaa7d15 100644 (file)
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -211,7 +211,7 @@ digest_isdn(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 1351bfdd23ac8661e9888414b670d193ff655167..0141f85ed05a7e4fb3bc775de6223770455745b0 100644 (file)
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -431,7 +431,7 @@ digest_key(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c
index ae8d438e2e8b81c7d2d72a8f0ccdba1ffe3bdada..97ef942c0ab00582ed837b61ee3e20498b48a1bf 100644 (file)
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -427,7 +427,7 @@ digest_keydata(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/l32_105.c b/lib/dns/rdata/generic/l32_105.c
index b2f02df64680ff3015a8fe024563b382169971a4..7530841bf609fe6e24a9e603128dab1bdce13133 100644 (file)
--- a/lib/dns/rdata/generic/l32_105.c
+++ b/lib/dns/rdata/generic/l32_105.c
@@ -194,7 +194,7 @@ digest_l32(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/l64_106.c b/lib/dns/rdata/generic/l64_106.c
index 6ff8fa83bd3d112d4a6e06e25ec796b53ed8181d..356d1d82f5466332bd49251155026c9e958005be 100644 (file)
--- a/lib/dns/rdata/generic/l64_106.c
+++ b/lib/dns/rdata/generic/l64_106.c
@@ -188,7 +188,7 @@ digest_l64(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index 8c8afc374c9571c686d598e3f94ff11416e3cb13..bdd5a7517bbe8c4754f74e1102d1e016b6facfe3 100644 (file)
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -800,7 +800,7 @@ digest_loc(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/lp_107.c b/lib/dns/rdata/generic/lp_107.c
index 5fa2709dbc059899d0e108ed52a55812351a3343..1420362e097d4921dc8986e0fbad1b29974baf4f 100644 (file)
--- a/lib/dns/rdata/generic/lp_107.c
+++ b/lib/dns/rdata/generic/lp_107.c
@@ -200,11 +200,11 @@ additionaldata_lp(ARGS_ADDLDATA) {
        isc_region_consume(&region, 2);
        dns_name_fromregion(&name, &region);
 
-       result = (add)(arg, &name, dns_rdatatype_l32, NULL);
+       result = (*add)(arg, &name, dns_rdatatype_l32, NULL);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }
-       return ((add)(arg, &name, dns_rdatatype_l64, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_l64, NULL));
 }
 
 static inline isc_result_t
@@ -214,7 +214,7 @@ digest_lp(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_lp);
 
        dns_rdata_toregion(rdata, &region);
-       return ((digest)(arg, &region));
+       return ((*digest)(arg, &region));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index f5a04dd2024029a7152c43334695fe146e848486..11c128b63b723f79456fcda2231f9484503bfaac 100644 (file)
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -185,7 +185,7 @@ additionaldata_mb(ARGS_ADDLDATA) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return ((add)(arg, &name, dns_rdatatype_a, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }
 
 static inline isc_result_t

diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 899607b1c870b67af97b3399649d81cc39d2a7af..69ccf95d687be6d16690047f2f706669149f2388 100644 (file)
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -186,7 +186,7 @@ additionaldata_md(ARGS_ADDLDATA) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return ((add)(arg, &name, dns_rdatatype_a, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }
 
 static inline isc_result_t

diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index f2363817917a2b5ec75f49c3c8a26ec77cab322f..469d35cd9edde8d4275149218d16714f7d98f320 100644 (file)
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -185,7 +185,7 @@ additionaldata_mf(ARGS_ADDLDATA) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return ((add)(arg, &name, dns_rdatatype_a, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }
 
 static inline isc_result_t

diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index a1aea6682954c3cdca30cd5cd83cdeb5b59d3fe6..88fe8d6ef4a10b9c18e75a1044d00df37d8ad978 100644 (file)
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -284,7 +284,7 @@ additionaldata_mx(ARGS_ADDLDATA) {
                return (ISC_R_SUCCESS);
        }
 
-       result = (add)(arg, &name, dns_rdatatype_a, NULL);
+       result = (*add)(arg, &name, dns_rdatatype_a, NULL);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }
@@ -296,8 +296,8 @@ additionaldata_mx(ARGS_ADDLDATA) {
                return (ISC_R_SUCCESS);
        }
 
-       return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa,
-                     NULL));
+       return ((*add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa,
+                      NULL));
 }
 
 static inline isc_result_t
@@ -311,7 +311,7 @@ digest_mx(ARGS_DIGEST) {
        r2 = r1;
        isc_region_consume(&r2, 2);
        r1.length = 2;
-       RETERR((digest)(arg, &r1));
+       RETERR((*digest)(arg, &r1));
        dns_name_init(&name, NULL);
        dns_name_fromregion(&name, &r2);
        return (dns_name_digest(&name, digest, arg));

diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index 440d481d4381eb9fcefbc68d7676b0f1efde8847..654eea9e9f3211bfde6655a882dd6e5f6dc80e61 100644 (file)
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -640,7 +640,7 @@ additionaldata_naptr(ARGS_ADDLDATA) {
        dns_name_fromregion(&name, &sr);
 
        if (atype != 0) {
-               return ((add)(arg, &name, atype, NULL));
+               return ((*add)(arg, &name, atype, NULL));
        }
 
        return (ISC_R_SUCCESS);
@@ -690,7 +690,7 @@ digest_naptr(ARGS_DIGEST) {
         * Digest the RR up to the replacement name.
         */
        r1.length = length;
-       result = (digest)(arg, &r1);
+       result = (*digest)(arg, &r1);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }

diff --git a/lib/dns/rdata/generic/nid_104.c b/lib/dns/rdata/generic/nid_104.c
index d8f9afa81555d12eb7d62c69f6a77d8d5f61e692..7ff52a05bae19dd2ff6a3100eaf772896fb28ecc 100644 (file)
--- a/lib/dns/rdata/generic/nid_104.c
+++ b/lib/dns/rdata/generic/nid_104.c
@@ -188,7 +188,7 @@ digest_nid(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/ninfo_56.c b/lib/dns/rdata/generic/ninfo_56.c
index a14356c0c7fd62650f10b085de8a189168303b06..88eb9a54f3ae035544a1733161b31473dd00866b 100644 (file)
--- a/lib/dns/rdata/generic/ninfo_56.c
+++ b/lib/dns/rdata/generic/ninfo_56.c
@@ -110,7 +110,7 @@ digest_ninfo(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index 84c6b35da1fab245f83343b2f36a2b65f2016ece..93df8fd6e795027ce9dfb3a3312c11d4a283eecd 100644 (file)
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -196,7 +196,7 @@ additionaldata_ns(ARGS_ADDLDATA) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return ((add)(arg, &name, dns_rdatatype_a, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }
 
 static inline isc_result_t

diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index 8f62a61533b4e76e7b57ad4d41a03e4b8a33bac2..7edc8f699cbbf201059cc82dcc0429252e1bb950 100644 (file)
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -376,7 +376,7 @@ digest_nsec3(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_nsec3);
 
        dns_rdata_toregion(rdata, &r);
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c
index db3a97413cabd4b79a72b2bb34ec78cbda8d8bd2..44e6c8461dbe927cf5d1644d8529aeed51923acd 100644 (file)
--- a/lib/dns/rdata/generic/nsec3param_51.c
+++ b/lib/dns/rdata/generic/nsec3param_51.c
@@ -286,7 +286,7 @@ digest_nsec3param(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_nsec3param);
 
        dns_rdata_toregion(rdata, &r);
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index 251268cec0f412c2bb8e0e3cad6ab41f5df624c8..4c4ed5b3da0a326f212005d2c63e2a232d07eed8 100644 (file)
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -227,7 +227,7 @@ digest_nsec(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_nsec);
 
        dns_rdata_toregion(rdata, &r);
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index f13d052e24902f798cd2a62f21248367b06f46f1..3b3bb7c657c7ee8b82772a47eb9c8b45d144a3dd 100644 (file)
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -151,7 +151,7 @@ digest_null(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index 8071996514bbebca4d011b70ff35d7370001596c..eadc716756e8b43698c9205abd9d9b2892525cc0 100644 (file)
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -316,7 +316,7 @@ digest_nxt(ARGS_DIGEST) {
        }
        isc_region_consume(&r, name_length(&name));
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c
index 8c4bec53e47c5ea1c3059fa2ff874fa46a6071c4..e01b5e696fce90932b80effc484398d2bedba3c0 100644 (file)
--- a/lib/dns/rdata/generic/openpgpkey_61.c
+++ b/lib/dns/rdata/generic/openpgpkey_61.c
@@ -202,7 +202,7 @@ digest_openpgpkey(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index 1db5d9e469492539ce39e20f75dcdcba76e7e157..4c85bd53c42bdc8d636983cd03afd6df1777d26d 100644 (file)
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -118,7 +118,7 @@ static inline isc_result_t digest_ #(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool checkowner_ #(ARGS_CHECKOWNER) {

diff --git a/lib/dns/rdata/generic/rkey_57.c b/lib/dns/rdata/generic/rkey_57.c
index afa294daae3d185b1a43d4b9cd2cf4564684691c..77dad340375ece21d3abd7de3c788840ec71f44a 100644 (file)
--- a/lib/dns/rdata/generic/rkey_57.c
+++ b/lib/dns/rdata/generic/rkey_57.c
@@ -121,7 +121,7 @@ digest_rkey(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 32efc23e24ebfc402ceff855f15998e247552e24..c6278dd330d265f6ab3acaffc37338dd5bd6a1be 100644 (file)
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -248,15 +248,15 @@ additionaldata_rt(ARGS_ADDLDATA) {
        isc_region_consume(&region, 2);
        dns_name_fromregion(&name, &region);
 
-       result = (add)(arg, &name, dns_rdatatype_x25, NULL);
+       result = (*add)(arg, &name, dns_rdatatype_x25, NULL);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }
-       result = (add)(arg, &name, dns_rdatatype_isdn, NULL);
+       result = (*add)(arg, &name, dns_rdatatype_isdn, NULL);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }
-       return ((add)(arg, &name, dns_rdatatype_a, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }
 
 static inline isc_result_t
@@ -271,7 +271,7 @@ digest_rt(ARGS_DIGEST) {
        r2 = r1;
        isc_region_consume(&r2, 2);
        r1.length = 2;
-       result = (digest)(arg, &r1);
+       result = (*digest)(arg, &r1);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }

diff --git a/lib/dns/rdata/generic/sink_40.c b/lib/dns/rdata/generic/sink_40.c
index 5d85652d9cf897e5bd0b498d56bb0d058066851e..a2fd801abdd39f9c2ebe76f8feee82d5b476166c 100644 (file)
--- a/lib/dns/rdata/generic/sink_40.c
+++ b/lib/dns/rdata/generic/sink_40.c
@@ -257,7 +257,7 @@ digest_sink(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/smimea_53.c b/lib/dns/rdata/generic/smimea_53.c
index dd3894b30de2ee695f52e73cfb28942b9b8190f5..432a7870faad8f18a2786eeee6829a50219568cf 100644 (file)
--- a/lib/dns/rdata/generic/smimea_53.c
+++ b/lib/dns/rdata/generic/smimea_53.c
@@ -117,7 +117,7 @@ digest_smimea(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index a6b687c0d4a22291cda0e927a7eb620ab0d6b629..3cb2592335738b8d6d3ba359fa358164e073b5f8 100644 (file)
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -389,7 +389,7 @@ digest_soa(ARGS_DIGEST) {
        RETERR(dns_name_digest(&name, digest, arg));
        isc_region_consume(&r, name_length(&name));
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c
index 29d5c54fa5e9896c0e088ec00445b1ed33655628..85515623aa5fa2f4307b7d38d9a42f5cd1d6b0e9 100644 (file)
--- a/lib/dns/rdata/generic/spf_99.c
+++ b/lib/dns/rdata/generic/spf_99.c
@@ -111,7 +111,7 @@ digest_spf(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c
index 8c91d8fbccef8690a4b656b9c3b9f6656dd37a21..f437beadf0bfdd14c0c04b74c2285faf8e045851 100644 (file)
--- a/lib/dns/rdata/generic/sshfp_44.c
+++ b/lib/dns/rdata/generic/sshfp_44.c
@@ -261,7 +261,7 @@ digest_sshfp(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/ta_32768.c b/lib/dns/rdata/generic/ta_32768.c
index 69875c36ab5c27bbce7ea70baf9f35c299f7dfdd..ef9aff8f80a84458a2ff7ba7b1be383a686f9902 100644 (file)
--- a/lib/dns/rdata/generic/ta_32768.c
+++ b/lib/dns/rdata/generic/ta_32768.c
@@ -127,7 +127,7 @@ digest_ta(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/talink_58.c b/lib/dns/rdata/generic/talink_58.c
index 95e954bbff8736315150e414382e9e5b8f012923..ce410785faf2c891d17dbf73b4342788124fbaf2 100644 (file)
--- a/lib/dns/rdata/generic/talink_58.c
+++ b/lib/dns/rdata/generic/talink_58.c
@@ -223,7 +223,7 @@ digest_talink(ARGS_DIGEST) {
        REQUIRE(rdata->type == dns_rdatatype_talink);
 
        dns_rdata_toregion(rdata, &r);
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/tlsa_52.c b/lib/dns/rdata/generic/tlsa_52.c
index 7ec2aaaa67879e3e79988c21df65aeb80154bd1c..fe5aac0d8a53193e4c827eff9204d6d9bba62188 100644 (file)
--- a/lib/dns/rdata/generic/tlsa_52.c
+++ b/lib/dns/rdata/generic/tlsa_52.c
@@ -304,7 +304,7 @@ digest_tlsa(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index b0f1c0c9aa02824b69a0286f9a08437aa8a07c39..381a27e0daf351cbf295cc5d6f2a3209f7a81002 100644 (file)
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -246,7 +246,7 @@ digest_txt(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/uri_256.c b/lib/dns/rdata/generic/uri_256.c
index b66b5834232cb9fea17ddc7b1572a6339764441e..594225ffdc41ae9196f0178f29c9f38e95ee7c92 100644 (file)
--- a/lib/dns/rdata/generic/uri_256.c
+++ b/lib/dns/rdata/generic/uri_256.c
@@ -283,7 +283,7 @@ digest_uri(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index ec27cecae60a8838f0fb2a0dea4e141a34990927..7e8a6ad969fe0162f504a358e738e5a0aa0428e4 100644 (file)
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -197,7 +197,7 @@ digest_x25(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/generic/zonemd_63.c b/lib/dns/rdata/generic/zonemd_63.c
index e4dae5548e929ba841239fc9822412090cb4456e..e11f8823ee541cf7c83faedf02315bd1787f476c 100644 (file)
--- a/lib/dns/rdata/generic/zonemd_63.c
+++ b/lib/dns/rdata/generic/zonemd_63.c
@@ -315,7 +315,7 @@ digest_zonemd(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index 484321594f6afea8b390c12f7ba7d2600606ae1d..ef0cab9750798c8506e0f692281370902a5d6e7f 100644 (file)
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -197,7 +197,7 @@ digest_hs_a(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index dd6c941276ce0abab360635e398df4c42f3e702a..8c5fb3f15441e9b353b43595fa54037891bf7245 100644 (file)
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -424,7 +424,7 @@ digest_in_a6(ARGS_DIGEST) {
        octets = 1 + 16 - prefixlen / 8;
 
        r1.length = octets;
-       result = (digest)(arg, &r1);
+       result = (*digest)(arg, &r1);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }

diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index cf544f027942bff3c7033d68848866d91886482e..6fa606602af7886c79045cf25de1c5164770e2cd 100644 (file)
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -202,7 +202,7 @@ digest_in_a(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 5ac6d649db1b3a20a1d6cca12242827de53e837a..de6406886de0712ece435028a30fdfba75528c3d 100644 (file)
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -214,7 +214,7 @@ digest_in_aaaa(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c
index 5ba4527b83056a3df993e8df120c3b96b84598fd..32d173187b3e6a4c1da0d902f617b6c3c9c1c7df 100644 (file)
--- a/lib/dns/rdata/in_1/apl_42.c
+++ b/lib/dns/rdata/in_1/apl_42.c
@@ -445,7 +445,7 @@ digest_in_apl(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/atma_34.c b/lib/dns/rdata/in_1/atma_34.c
index 11fb20326790898c18325963715576e3fb8317f9..b8cd241b3c30546682558ec46e9b95ac77ae93d8 100644 (file)
--- a/lib/dns/rdata/in_1/atma_34.c
+++ b/lib/dns/rdata/in_1/atma_34.c
@@ -280,7 +280,7 @@ digest_in_atma(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index 8353e69f1043de04091dad372862ea63e8167eed..0259e26cc06538962d03581361d2a42d8cbf05f9 100644 (file)
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -198,7 +198,7 @@ digest_in_dhcid(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/eid_31.c b/lib/dns/rdata/in_1/eid_31.c
index 454ad2d570badacd61c05dfb17a6aba142874b4c..da8645cfa7a2411ef6a3bbeb13a3eb1aa71b6ccd 100644 (file)
--- a/lib/dns/rdata/in_1/eid_31.c
+++ b/lib/dns/rdata/in_1/eid_31.c
@@ -187,7 +187,7 @@ digest_in_eid(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/https_65.c b/lib/dns/rdata/in_1/https_65.c
index ed5bfb98ff638acedba871ea4f64fcd4c1e59a95..3eb450abce46805e9c448a80eba24809a5e20a86 100644 (file)
--- a/lib/dns/rdata/in_1/https_65.c
+++ b/lib/dns/rdata/in_1/https_65.c
@@ -123,7 +123,7 @@ digest_in_https(ARGS_DIGEST) {
        REQUIRE(rdata->rdclass == dns_rdataclass_in);
 
        dns_rdata_toregion(rdata, &region1);
-       return ((digest)(arg, &region1));
+       return ((*digest)(arg, &region1));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index af45afb0d3ff4e2940449d0a94cf9b84a6ea9fb2..9398dd22a808608044f89b30d267de0d41aa65cb 100644 (file)
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -235,7 +235,7 @@ additionaldata_in_kx(ARGS_ADDLDATA) {
        isc_region_consume(&region, 2);
        dns_name_fromregion(&name, &region);
 
-       return ((add)(arg, &name, dns_rdatatype_a, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }
 
 static inline isc_result_t
@@ -250,7 +250,7 @@ digest_in_kx(ARGS_DIGEST) {
        r2 = r1;
        isc_region_consume(&r2, 2);
        r1.length = 2;
-       RETERR((digest)(arg, &r1));
+       RETERR((*digest)(arg, &r1));
        dns_name_init(&name, NULL);
        dns_name_fromregion(&name, &r2);
        return (dns_name_digest(&name, digest, arg));

diff --git a/lib/dns/rdata/in_1/nimloc_32.c b/lib/dns/rdata/in_1/nimloc_32.c
index ce4cc5f2af9cc7bb9b7ccac5763443e53421ed80..dcd17540595c24c8a2d9fd63bf5e5b341d7cbc10 100644 (file)
--- a/lib/dns/rdata/in_1/nimloc_32.c
+++ b/lib/dns/rdata/in_1/nimloc_32.c
@@ -187,7 +187,7 @@ digest_in_nimloc(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index fa2d3d6d3b1092d26086a96e7464ff5163a9b333..c54d873a5552026510d88f45f0d0576af0117db9 100644 (file)
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -222,7 +222,7 @@ digest_in_nsap(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index a642306723487628b1a813d33f65cea21d95a8d9..b33ab93972a968cbf25260438b47c456ed39b77d 100644 (file)
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -320,7 +320,7 @@ digest_in_px(ARGS_DIGEST) {
        r2 = r1;
        isc_region_consume(&r2, 2);
        r1.length = 2;
-       result = (digest)(arg, &r1);
+       result = (*digest)(arg, &r1);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }

diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index f0e72cf3fb397ddec5c585359a94baaef8fd1b86..54991777bc6c8ae125fe2569332d6dbcb4827c81 100644 (file)
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -326,7 +326,7 @@ additionaldata_in_srv(ARGS_ADDLDATA) {
                return (ISC_R_SUCCESS);
        }
 
-       result = (add)(arg, &name, dns_rdatatype_a, NULL);
+       result = (*add)(arg, &name, dns_rdatatype_a, NULL);
        if (result != ISC_R_SUCCESS) {
                return (result);
        }
@@ -345,8 +345,8 @@ additionaldata_in_srv(ARGS_ADDLDATA) {
                return (ISC_R_SUCCESS);
        }
 
-       return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa,
-                     NULL));
+       return ((*add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa,
+                      NULL));
 }
 
 static inline isc_result_t
@@ -361,7 +361,7 @@ digest_in_srv(ARGS_DIGEST) {
        r2 = r1;
        isc_region_consume(&r2, 6);
        r1.length = 6;
-       RETERR((digest)(arg, &r1));
+       RETERR((*digest)(arg, &r1));
        dns_name_init(&name, NULL);
        dns_name_fromregion(&name, &r2);
        return (dns_name_digest(&name, digest, arg));

diff --git a/lib/dns/rdata/in_1/svcb_64.c b/lib/dns/rdata/in_1/svcb_64.c
index 068f93619b8c6485c33fecfff913c8966a6fc1ac..305ee1d423fed686a94347fd55540af50c0ae95b 100644 (file)
--- a/lib/dns/rdata/in_1/svcb_64.c
+++ b/lib/dns/rdata/in_1/svcb_64.c
@@ -1095,7 +1095,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
                        return (ISC_R_SUCCESS);
                }
                /* Only lookup address records */
-               return ((add)(arg, owner, dns_rdatatype_a, NULL));
+               return ((*add)(arg, owner, dns_rdatatype_a, NULL));
        }
 
        /*
@@ -1104,7 +1104,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
        dns_rdataset_init(&rdataset);
        fname = dns_fixedname_initname(&fixed);
        do {
-               RETERR((add)(arg, &name, dns_rdatatype_cname, &rdataset));
+               RETERR((*add)(arg, &name, dns_rdatatype_cname, &rdataset));
                if (dns_rdataset_isassociated(&rdataset)) {
                        isc_result_t result;
                        result = dns_rdataset_first(&rdataset);
@@ -1138,7 +1138,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
         * Look up HTTPS/SVCB records when processing the alias form.
         */
        if (alias) {
-               RETERR((add)(arg, &name, rdata->type, &rdataset));
+               RETERR((*add)(arg, &name, rdata->type, &rdataset));
                /*
                 * Don't return A or AAAA if this is not the last element
                 * in the HTTP / SVCB chain.
@@ -1148,7 +1148,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
                        return (ISC_R_SUCCESS);
                }
        }
-       return ((add)(arg, &name, dns_rdatatype_a, NULL));
+       return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }
 
 static inline isc_result_t
@@ -1167,7 +1167,7 @@ digest_in_svcb(ARGS_DIGEST) {
        REQUIRE(rdata->rdclass == dns_rdataclass_in);
 
        dns_rdata_toregion(rdata, &region1);
-       return ((digest)(arg, &region1));
+       return ((*digest)(arg, &region1));
 }
 
 static inline bool

diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index b837c55920145b0c5cbfc4a2e1b1b1ee3420eda9..ca21a95baafd3a37c7e950531016b7598752c209 100644 (file)
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -380,7 +380,7 @@ digest_in_wks(ARGS_DIGEST) {
 
        dns_rdata_toregion(rdata, &r);
 
-       return ((digest)(arg, &r));
+       return ((*digest)(arg, &r));
 }
 
 static inline bool

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 20d31386f08c6daa073b823cc1617897ce10da3b..ead2b2b4ebffcaabe30507e86135061a8c0296a1 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2999,7 +2999,8 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
         */
        if (!dns_name_issubdomain(name, &zone->origin)) {
                if (zone->checkns != NULL) {
-                       return ((zone->checkns)(zone, name, owner, NULL, NULL));
+                       return ((*zone->checkns)(zone, name, owner, NULL,
+                                                NULL));
                }
                return (true);
        }

diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index 0d235a21bbbb6d7bfc58fe5631d89657a8520caa..70ff0ff0efe03fab032d89e3fcebad791582cba3 100644 (file)
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -548,7 +548,7 @@ dns_zt_apply(dns_zt_t *zt, bool stop, isc_result_t *sub,
                if (result == ISC_R_SUCCESS) {
                        zone = node->data;
                        if (zone != NULL) {
-                               result = (action)(zone, uap);
+                               result = (*action)(zone, uap);
                        }
                        if (result != ISC_R_SUCCESS && stop) {
                                tresult = result;

diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index 678c462872ff918f0132fa26b3db35dea0a2a71e..1490a4801623d240b66679f23351563b133a0ba7 100644 (file)
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -278,6 +278,6 @@ isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap) {
        REQUIRE(action != NULL);
 
        for (i = 1; i <= heap->last; i++) {
-               (action)(heap->array[i], uap);
+               (*action)(heap->array[i], uap);
        }
 }

diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c
index eabbe580cb66fcb9cf4cd5b197607e480886ad28..494c20363d99528fa50523e6f50a7ede3717d8d8 100644 (file)
--- a/lib/isccc/symtab.c
+++ b/lib/isccc/symtab.c
@@ -277,7 +277,7 @@ isccc_symtab_foreach(isccc_symtab_t *symtab, isccc_symtabforeachaction_t action,
                for (elt = ISC_LIST_HEAD(symtab->table[i]); elt != NULL;
                     elt = nelt) {
                        nelt = ISC_LIST_NEXT(elt, link);
-                       if ((action)(elt->key, elt->type, elt->value, arg)) {
+                       if ((*action)(elt->key, elt->type, elt->value, arg)) {
                                free_elt(symtab, i, elt);
                        }
                }