mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Add curly brackets on if statements

Browse Source
This commit is contained in:
Matthijs Mekking
2019-02-08 15:28:49 +01:00
committed by Matthijs Mekking
parent a490c09121
commit 2e5e429644
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/dns/zone.c
View File

@@ -2494,9 +2494,11 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) {
dns_zone_rpz_enable_db(zone, db); dns_zone_rpz_enable_db(zone, db);
dns_zone_catz_enable_db(zone, db); dns_zone_catz_enable_db(zone, db);
options = get_master_options(zone); options = get_master_options(zone);
if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_MANYERRORS)) if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_MANYERRORS)) {
options |= DNS_MASTER_MANYERRORS; options |= DNS_MASTER_MANYERRORS;
}
if (zone->zmgr != NULL && zone->db != NULL && zone->loadtask != NULL) { if (zone->zmgr != NULL && zone->db != NULL && zone->loadtask != NULL) {
load = isc_mem_get(zone->mctx, sizeof(*load)); load = isc_mem_get(zone->mctx, sizeof(*load));
@@ -2516,8 +2518,9 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) {
load->callbacks.rawdata = zone_setrawdata; load->callbacks.rawdata = zone_setrawdata;
zone_iattach(zone, &load->callbacks.zone); zone_iattach(zone, &load->callbacks.zone);
result = dns_db_beginload(db, &load->callbacks); result = dns_db_beginload(db, &load->callbacks);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS) {
goto cleanup; goto cleanup;
}
result = zonemgr_getio(zone->zmgr, true, zone->loadtask, result = zonemgr_getio(zone->zmgr, true, zone->loadtask,
zone_gotreadhandle, load, zone_gotreadhandle, load,
&zone->readio); &zone->readio);
@@ -2528,8 +2531,9 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) {
*/ */
(void)dns_db_endload(load->db, &load->callbacks); (void)dns_db_endload(load->db, &load->callbacks);
goto cleanup; goto cleanup;
} else } else {
result = DNS_R_CONTINUE; result = DNS_R_CONTINUE;
}
} else { } else {
dns_rdatacallbacks_t callbacks; dns_rdatacallbacks_t callbacks;
@@ -2550,8 +2554,9 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) {
zone->masterformat, zone->masterformat,
zone->maxttl); zone->maxttl);
tresult = dns_db_endload(db, &callbacks); tresult = dns_db_endload(db, &callbacks);
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS) {
result = tresult; result = tresult;
}
zone_idetach(&callbacks.zone); zone_idetach(&callbacks.zone);
} }