upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 13:12:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor cleanup and addressed a sprintf format warning

Browse source
This commit is contained in:
Evan Hunt 2018-02-24 17:55:24 -08:00
parent 48ca11df5f
commit ab0fe63f07
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/named/server.c
View file

@ -14788,7 +14788,7 @@ isc_result_t
named_server_dnstap(named_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;

8
bin/named/statschannel.c
View file

@ -1600,7 +1600,7 @@ generatexml(named_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;
@ -1723,7 +1723,7 @@ generatexml(named_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,
@ -2395,7 +2395,7 @@ generatejson(named_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;
@ -2562,7 +2562,7 @@ generatejson(named_server_t *server, size_t *msglen,
else
json_object_put(counters);
#if HAVE_DNSTAP
#ifdef HAVE_DNSTAP
/* dnstap stat counters */
if (named_g_server->dtenv != NULL) {
isc_stats_t *dnstapstats = NULL;

6
lib/bind9/check.c
View file

@ -894,7 +894,7 @@ typedef struct {
unsigned int max;
} intervaltable;
#if HAVE_DNSTAP
#ifdef HAVE_DNSTAP
typedef struct {
const char *name;
unsigned int min;
@ -978,7 +978,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",
@ -1459,7 +1459,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;

2
lib/dns/catz.c
View file

@ -1550,7 +1550,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);
}