From: Mark Andrews <marka@isc.org>
Date: Wed, 19 Dec 2012 01:39:54 +0000 (+1100)
Subject: silence signed/unsigned warning; rename log -> fctx_log
X-Git-Tag: v9.10.0a1~649
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=45d4341eedd047aaafd927837d5407d990ed345f;p=thirdparty%2Fbind9.git

silence signed/unsigned warning; rename log -> fctx_log
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 42d15bbecf2..0b30a8cd8a4 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4421,7 +4421,7 @@ validated(isc_task_t *task, isc_event_t *event) {
 }
 
 static void
-log(void *arg, int level, const char *fmt, ...) {
+fctx_log(void *arg, int level, const char *fmt, ...) {
 	char msgbuf[2048];
 	va_list args;
 	fetchctx_t *fctx = arg;
@@ -4479,7 +4479,7 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type,
 		result = dns_rdata_tostruct(&rdata, &rrsig, NULL);
 		RUNTIME_CHECK(result == ISC_R_SUCCESS);
 		/* Wildcard has rrsig.labels < labels - 1. */
-		if (rrsig.labels + 1 >= labels)
+		if (rrsig.labels + 1U >= labels)
 			continue;
 		break;
 	}
@@ -4520,7 +4520,7 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type,
 			if (nrdataset->type == dns_rdatatype_nsec &&
 			    NXND(dns_nsec_noexistnodata(type, name, nsec,
 							nrdataset, &exists,
-							&data, NULL, log,
+							&data, NULL, fctx_log,
 							fctx)))
 			{
 				if (!exists)
@@ -4535,7 +4535,7 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type,
 							 &setclosest,
 							 &setnearest,
 							 closest, nearest,
-							 log, fctx)))
+							 fctx_log, fctx)))
 			{
 				if (!exists && setnearest)
 					*noqname = nsec;