From 1596d3b498cf9363ddb3c5978a3f01729cefcd09 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Thu, 2 Apr 2020 18:53:53 +0200 Subject: [PATCH] Merge if blocks in statschannel.c --- bin/named/statschannel.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 6dc031a0bb..25bec658bf 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -2705,49 +2705,49 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { dnssecsignstats = dns_zone_getdnssecsignstats(zone); if (dnssecsignstats != NULL) { stats_dumparg_t dumparg; - json_object *counters = json_object_new_object(); - CHECKMEM(counters); + json_object *sign_counters = json_object_new_object(); + CHECKMEM(sign_counters); dumparg.type = isc_statsformat_json; - dumparg.arg = counters; + dumparg.arg = sign_counters; dumparg.result = ISC_R_SUCCESS; dns_dnssecsignstats_dump( dnssecsignstats, dns_dnssecsignstats_sign, dnssecsignstat_dump, &dumparg, 0); if (dumparg.result != ISC_R_SUCCESS) { - json_object_put(counters); + json_object_put(sign_counters); goto error; } - if (json_object_get_object(counters)->count != 0) { + if (json_object_get_object(sign_counters)->count != 0) { json_object_object_add(zoneobj, "dnssec-sign", - counters); + sign_counters); } else { - json_object_put(counters); + json_object_put(sign_counters); } - } - if (dnssecsignstats != NULL) { - stats_dumparg_t dumparg; - json_object *counters = json_object_new_object(); - CHECKMEM(counters); + json_object *refresh_counters = + json_object_new_object(); + CHECKMEM(refresh_counters); dumparg.type = isc_statsformat_json; - dumparg.arg = counters; + dumparg.arg = refresh_counters; dumparg.result = ISC_R_SUCCESS; dns_dnssecsignstats_dump( dnssecsignstats, dns_dnssecsignstats_refresh, dnssecsignstat_dump, &dumparg, 0); if (dumparg.result != ISC_R_SUCCESS) { - json_object_put(counters); + json_object_put(refresh_counters); goto error; } - if (json_object_get_object(counters)->count != 0) { - json_object_object_add( - zoneobj, "dnssec-refresh", counters); + if (json_object_get_object(refresh_counters)->count != + 0) { + json_object_object_add(zoneobj, + "dnssec-refresh", + refresh_counters); } else { - json_object_put(counters); + json_object_put(refresh_counters); } } }