From: Michał Kępień <michal@isc.org>
Date: Mon, 11 Jun 2018 10:49:06 +0000 (+0200)
Subject: Reimplement all zone logging functions using dns_zone_logv()
X-Git-Tag: v9.13.2~43^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5c03cd339e1c02cc0b05b95bb201d79d38129482;p=thirdparty%2Fbind9.git

Reimplement all zone logging functions using dns_zone_logv()

In order to decrease code duplication, express the logic contained in
all zone logging functions using dns_zone_logv() calls.
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index cbd286512ac..df47fe797a5 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -13797,16 +13797,10 @@ dns_zone_logv(dns_zone_t *zone, isc_logcategory_t *category, int level,
 static void
 notify_log(dns_zone_t *zone, int level, const char *fmt, ...) {
 	va_list ap;
-	char message[4096];
-
-	if (isc_log_wouldlog(dns_lctx, level) == ISC_FALSE)
-		return;
 
 	va_start(ap, fmt);
-	vsnprintf(message, sizeof(message), fmt, ap);
+	dns_zone_logv(zone, DNS_LOGCATEGORY_NOTIFY, level, NULL, fmt, ap);
 	va_end(ap);
-	isc_log_write(dns_lctx, DNS_LOGCATEGORY_NOTIFY, DNS_LOGMODULE_ZONE,
-		      level, "zone %s: %s", zone->strnamerd, message);
 }
 
 void
@@ -13814,67 +13808,31 @@ dns_zone_logc(dns_zone_t *zone, isc_logcategory_t *category,
 	      int level, const char *fmt, ...)
 {
 	va_list ap;
-	char message[4096];
-
-	if (isc_log_wouldlog(dns_lctx, level) == ISC_FALSE)
-		return;
 
 	va_start(ap, fmt);
-	vsnprintf(message, sizeof(message), fmt, ap);
+	dns_zone_logv(zone, category, level, NULL, fmt, ap);
 	va_end(ap);
-	isc_log_write(dns_lctx, category, DNS_LOGMODULE_ZONE,
-		      level, "%s%s: %s", (zone->type == dns_zone_key) ?
-		      "managed-keys-zone" : (zone->type == dns_zone_redirect) ?
-		      "redirect-zone" : "zone ", zone->strnamerd, message);
 }
 
 void
 dns_zone_log(dns_zone_t *zone, int level, const char *fmt, ...) {
 	va_list ap;
-	char message[4096];
-
-	if (isc_log_wouldlog(dns_lctx, level) == ISC_FALSE)
-		return;
 
 	va_start(ap, fmt);
-	vsnprintf(message, sizeof(message), fmt, ap);
+	dns_zone_logv(zone, DNS_LOGCATEGORY_GENERAL, level, NULL, fmt, ap);
 	va_end(ap);
-	isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_ZONE,
-		      level, "%s%s: %s", (zone->type == dns_zone_key) ?
-		      "managed-keys-zone" : (zone->type == dns_zone_redirect) ?
-		      "redirect-zone" : "zone ", zone->strnamerd, message);
 }
 
 static void
 zone_debuglog(dns_zone_t *zone, const char *me, int debuglevel,
 	      const char *fmt, ...)
 {
-	va_list ap;
-	char message[4096];
 	int level = ISC_LOG_DEBUG(debuglevel);
-	const char *zstr;
-
-	if (isc_log_wouldlog(dns_lctx, level) == ISC_FALSE)
-		return;
+	va_list ap;
 
 	va_start(ap, fmt);
-	vsnprintf(message, sizeof(message), fmt, ap);
+	dns_zone_logv(zone, DNS_LOGCATEGORY_GENERAL, level, me, fmt, ap);
 	va_end(ap);
-
-	switch (zone->type) {
-	case dns_zone_key:
-		zstr = "managed-keys-zone";
-		break;
-	case dns_zone_redirect:
-		zstr = "redirect-zone";
-		break;
-	default:
-		zstr = "zone";
-	}
-
-	isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_ZONE,
-		      level, "%s: %s %s: %s", me, zstr, zone->strnamerd,
-		      message);
 }
 
 static int