From: Mark Andrews <marka@isc.org>
Date: Mon, 18 Jun 2018 01:10:42 +0000 (+1000)
Subject: fix casecompare return type for ninfo, tkey, txt
X-Git-Tag: v9.11.4rc2~10^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=236ab4c453308eecad474ddd6130457ccc1589a1;p=thirdparty%2Fbind9.git

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 3f018197b27..cd088b3057e 100644
--- a/lib/dns/rdata/generic/ninfo_56.c
+++ b/lib/dns/rdata/generic/ninfo_56.c
@@ -155,7 +155,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 e08034db691..42a6e722afe 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -549,7 +549,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 2eb0e53d7f8..832b72bf862 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -273,7 +273,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));
 }