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

Merge branch 'each-style-tweak' into 'master'

Browse Source 
adjust clang-format options to get closer to ISC style

See merge request isc-projects/bind9!3061

(cherry picked from commit d3b49b6675)

0255a974 revise .clang-format and add a C formatting script in util
e851ed0b apply the modified style
This commit is contained in:
Ondřej Surý
2020-02-14 05:35:17 +00:00
parent c646c20e79
commit cdef20bb66
672 changed files with 36044 additions and 42228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bin/tests/system/dyndb/driver/zone.c
View File

@@ -28,13 +28,12 @@ extern const char *impname;
*/
isc_result_t
create_zone(sample_instance_t *const inst, dns_name_t *const name,
dns_zone_t **const rawp)
{
dns_zone_t **const rawp) {
isc_result_t result;
dns_zone_t * raw = NULL;
const char * zone_argv[1];
char zone_name[DNS_NAME_FORMATSIZE];
dns_acl_t * acl_any = NULL;
dns_zone_t *raw = NULL;
const char *zone_argv[1];
char zone_name[DNS_NAME_FORMATSIZE];
dns_acl_t *acl_any = NULL;
REQUIRE(inst != NULL);
REQUIRE(name != NULL);
@@ -104,12 +103,11 @@ cleanup:
* to clients.
*/
static isc_result_t
publish_zone(sample_instance_t *inst, dns_zone_t *zone)
{
publish_zone(sample_instance_t *inst, dns_zone_t *zone) {
isc_result_t result;
bool freeze = false;
dns_zone_t * zone_in_view = NULL;
dns_view_t * view_in_zone = NULL;
bool freeze = false;
dns_zone_t *zone_in_view = NULL;
dns_view_t *view_in_zone = NULL;
isc_result_t lock_state = ISC_R_IGNORE;
REQUIRE(inst != NULL);
@@ -180,15 +178,15 @@ cleanup:
* on the secure zone!
*/
static isc_result_t
load_zone(dns_zone_t *zone)
{
load_zone(dns_zone_t *zone) {
isc_result_t result;
bool zone_dynamic;
uint32_t serial;
bool zone_dynamic;
uint32_t serial;
result = dns_zone_load(zone, false);
if (result != ISC_R_SUCCESS && result != DNS_R_UPTODATE &&
result != DNS_R_DYNAMIC && result != DNS_R_CONTINUE) {
result != DNS_R_DYNAMIC && result != DNS_R_CONTINUE)
{
goto cleanup;
}
zone_dynamic = (result == DNS_R_DYNAMIC);
@@ -214,8 +212,7 @@ cleanup:
* Add zone to view and call dns_zone_load().
*/
isc_result_t
activate_zone(sample_instance_t *inst, dns_zone_t *raw)
{
activate_zone(sample_instance_t *inst, dns_zone_t *raw) {
isc_result_t result;
/*