minor cleanup and addressed a sprintf format warning

(cherry picked from commit ab0fe63f071de06d201961151c93bdb5d4ad9b73)

diff --git a/bin/named/server.c b/bin/named/server.c
index 244f7666e24e308ca730c8cd343b9dff52586b90..5ef5f40125aec4a9ef8ed0da63043b5797c5319c 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -14027,7 +14027,7 @@ ns_server_mkeys(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
 
 isc_result_t
 ns_server_dnstap(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
        char *ptr;
        isc_result_t result;
        isc_boolean_t reopen = ISC_FALSE;

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 4b020375c2ce7f36808a03835f2e61afb3ea716b..a352af2dfa772d627662f40ccbb293ca5a9f993a 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -1511,7 +1511,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags,
        isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max];
        isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max];
        isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max];
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
        isc_uint64_t dnstapstat_values[dns_dnstapcounter_max];
 #endif
        isc_result_t result;
@@ -1630,7 +1630,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags,
                        goto error;
                TRY0(xmlTextWriterEndElement(writer)); /* resstat */
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
                if (server->dtenv != NULL) {
                        isc_stats_t *dnstapstats = NULL;
                        TRY0(xmlTextWriterStartElement(writer,
@@ -2266,7 +2266,7 @@ generatejson(ns_server_t *server, size_t *msglen,
        isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max];
        isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max];
        isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max];
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
        isc_uint64_t dnstapstat_values[dns_dnstapcounter_max];
 #endif
        stats_dumparg_t dumparg;
@@ -2431,7 +2431,7 @@ generatejson(ns_server_t *server, size_t *msglen,
                else
                        json_object_put(counters);
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
                /* dnstap stat counters */
                if (ns_g_server->dtenv != NULL) {
                        isc_stats_t *dnstapstats = NULL;

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index c40f287012a7a83a4502e1cf12843bae26a561b4..51124eed985b7ef31e39056115990ca6270b14a3 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -881,7 +881,7 @@ typedef struct {
        unsigned int max;
 } intervaltable;
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 typedef struct {
        const char *name;
        unsigned int min;
@@ -965,7 +965,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
                NULL
        };
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
        static fstrmtable fstrm[] = {
                {
                        "fstrm-set-buffer-hint",
@@ -1423,7 +1423,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
                }
        }
 
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
        for (i = 0; i < sizeof(fstrm) / sizeof(fstrm[0]); i++) {
                isc_uint32_t value;
 

diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 1704572bd1ed485589b5f2c9e19216659626434c..7f9419dda3c107ce72c862fdbc4e4950f625867e 100644 (file)
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1547,7 +1547,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
        if (entry->opts.masters.count > 0 &&
            entry->opts.masters.dscps[0] >= 0) {
                isc_buffer_putstr(buffer, " dscp ");
-               snprintf(pbuf, sizeof(pbuf), "%d",
+               snprintf(pbuf, sizeof(pbuf), "%hd",
                         entry->opts.masters.dscps[0]);
                isc_buffer_putstr(buffer, pbuf);
        }