fix casecompare return type for ninfo, tkey, txt

(cherry picked from commit 3ba1d1e43b1183eb3d6faa94262f114cfcea8c54)

diff --git a/lib/dns/rdata/generic/ninfo_56.c b/lib/dns/rdata/generic/ninfo_56.c
index 775566ec157adb7fafcc8e9b85f3966ab45d6f26..5d4bc62791e841744f1fc07cba4e1575a8f0873c 100644 (file)
--- a/lib/dns/rdata/generic/ninfo_56.c
+++ b/lib/dns/rdata/generic/ninfo_56.c
@@ -160,7 +160,7 @@ checknames_ninfo(ARGS_CHECKNAMES) {
        return (ISC_TRUE);
 }
 
-static inline isc_result_t
+static inline int
 casecompare_ninfo(ARGS_COMPARE) {
        return (compare_ninfo(rdata1, rdata2));
 }

diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index 3a8ac9e031ea0fb0815b3a509d18c45b269218a7..ca0d54b4d514ef2182fde216f8811f7dbb46dad3 100644 (file)
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -560,7 +560,7 @@ checknames_tkey(ARGS_CHECKNAMES) {
        return (ISC_TRUE);
 }
 
-static inline isc_result_t
+static inline int
 casecompare_tkey(ARGS_COMPARE) {
        return (compare_tkey(rdata1, rdata2));
 }

diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index 11b811c3e6721a3f1cb470bac25964b16a20845e..626c01eb8e1695e9567fc9f30640b40e0069b5c6 100644 (file)
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -280,7 +280,7 @@ checknames_txt(ARGS_CHECKNAMES) {
        return (ISC_TRUE);
 }
 
-static inline isc_result_t
+static inline int
 casecompare_txt(ARGS_COMPARE) {
        return (compare_txt(rdata1, rdata2));
 }