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

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

View File

@@ -29,8 +29,7 @@
#include "isctest.h"
static int
_setup(void **state)
{
_setup(void **state) {
isc_result_t result;
UNUSED(state);
@@ -42,8 +41,7 @@ _setup(void **state)
}
static int
_teardown(void **state)
{
_teardown(void **state) {
UNUSED(state);
isc_test_end();
@@ -52,8 +50,7 @@ _teardown(void **state)
}
static void
undefine(char *key, unsigned int type, isc_symvalue_t value, void *arg)
{
undefine(char *key, unsigned int type, isc_symvalue_t value, void *arg) {
UNUSED(arg);
assert_int_equal(type, 1);
@@ -63,13 +60,12 @@ undefine(char *key, unsigned int type, isc_symvalue_t value, void *arg)
/* test symbol table growth */
static void
symtab_grow(void **state)
{
isc_result_t result;
isc_symtab_t * st = NULL;
isc_symvalue_t value;
symtab_grow(void **state) {
isc_result_t result;
isc_symtab_t *st = NULL;
isc_symvalue_t value;
isc_symexists_t policy = isc_symexists_reject;
int i;
int i;
UNUSED(state);
@@ -152,8 +148,7 @@ symtab_grow(void **state)
}
int
main(void)
{
main(void) {
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(symtab_grow, _setup, _teardown),
};
@@ -166,8 +161,7 @@ main(void)
#include <stdio.h>
int
main(void)
{
main(void) {
printf("1..0 # Skipped: cmocka not available\n");
return (0);
}