ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '46-add-curly-braces' into 'master'

Browse Source 
Add curly braces using uncrustify and then reformat with clang-format back

Closes #46

See merge request isc-projects/bind9!3057

(cherry picked from commit 67b68e06ad)

36c6105e Use coccinelle to add braces to nested single line statement
d14bb713 Add copy of run-clang-tidy that can fixup the filepaths
056e133c Use clang-tidy to add curly braces around one-line statements
This commit is contained in:
Ondřej Surý
2020-02-13 21:28:07 +00:00
parent 6270e602ea
commit 2e55baddd8
639 changed files with 29724 additions and 17080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
bin/tests/optional/zone_test.c
View File

@@ -82,9 +82,10 @@ setup(const char *zonename, const char *filename, const char *classname)
dns_name_t * origin;
const char * rbt = "rbt";
if (debug)
if (debug) {
fprintf(stderr, "loading \"%s\" from \"%s\" class \"%s\"\n",
zonename, filename, classname);
}
result = dns_zone_create(&zone, mctx);
ERRRET(result, "dns_zone_new");
@@ -115,8 +116,9 @@ setup(const char *zonename, const char *filename, const char *classname)
dns_zone_setclass(zone, rdclass);
if (zonetype == dns_zone_slave)
if (zonetype == dns_zone_slave) {
dns_zone_setmasters(zone, &addr, 1);
}
result = dns_zone_load(zone, false);
ERRRET(result, "dns_zone_load");
@@ -136,10 +138,11 @@ print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset)
isc_buffer_init(&text, t, sizeof(t));
result = dns_rdataset_totext(rdataset, name, false, false, &text);
isc_buffer_usedregion(&text, &r);
if (result == ISC_R_SUCCESS)
if (result == ISC_R_SUCCESS) {
printf("%.*s", (int)r.length, (char *)r.base);
else
} else {
printf("%s\n", dns_result_totext(result));
}
}
static void
@@ -181,19 +184,22 @@ query(void)
buf[sizeof(buf) - 1] = '\0';
s = strchr(buf, '\n');
if (s != NULL)
if (s != NULL) {
*s = '\0';
}
s = strchr(buf, '\r');
if (s != NULL)
if (s != NULL) {
*s = '\0';
}
if (strcmp(buf, "dump") == 0) {
dns_zone_dumptostream(zone, stdout,
dns_masterformat_text,
&dns_master_style_default, 0);
continue;
}
if (strlen(buf) == 0U)
if (strlen(buf) == 0U) {
continue;
}
dns_fixedname_init(&name);
isc_buffer_init(&buffer, buf, strlen(buf));
isc_buffer_add(&buffer, strlen(buf));
@@ -219,10 +225,12 @@ query(void)
break;
}
if (dns_rdataset_isassociated(&rdataset))
if (dns_rdataset_isassociated(&rdataset)) {
dns_rdataset_disassociate(&rdataset);
if (dns_rdataset_isassociated(&sigset))
}
if (dns_rdataset_isassociated(&sigset)) {
dns_rdataset_disassociate(&sigset);
}
} while (1);
dns_rdataset_invalidate(&rdataset);
dns_db_detach(&db);
@@ -244,8 +252,9 @@ main(int argc, char **argv)
debug++;
break;
case 'f':
if (filename != NULL)
if (filename != NULL) {
usage();
}
filename = isc_commandline_argument;
break;
case 'm':
@@ -276,8 +285,9 @@ main(int argc, char **argv)
}
}
if (argv[isc_commandline_index] == NULL)
if (argv[isc_commandline_index] == NULL) {
usage();
}
RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS);
isc_mem_create(&mctx);
@@ -287,19 +297,22 @@ main(int argc, char **argv)
RUNTIME_CHECK(isc_socketmgr_create(mctx, &socketmgr) == ISC_R_SUCCESS);
RUNTIME_CHECK(dns_zonemgr_create(mctx, taskmgr, timermgr, socketmgr,
&zonemgr) == ISC_R_SUCCESS);
if (filename == NULL)
if (filename == NULL) {
filename = argv[isc_commandline_index];
}
setup(argv[isc_commandline_index], filename, classname);
query();
if (zone != NULL)
if (zone != NULL) {
dns_zone_detach(&zone);
}
dns_zonemgr_shutdown(zonemgr);
dns_zonemgr_detach(&zonemgr);
isc_socketmgr_destroy(&socketmgr);
isc_taskmgr_destroy(&taskmgr);
isc_timermgr_destroy(&timermgr);
if (!quiet && stats)
if (!quiet && stats) {
isc_mem_stats(mctx, stdout);
}
isc_mem_destroy(&mctx);
return (0);