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

@@ -34,8 +34,7 @@
#include "dnstest.h"
static int
_setup(void **state)
{
_setup(void **state) {
isc_result_t result;
UNUSED(state);
@@ -47,8 +46,7 @@ _setup(void **state)
}
static int
_teardown(void **state)
{
_teardown(void **state) {
UNUSED(state);
dns_test_end();
@@ -58,10 +56,9 @@ _teardown(void **state)
/* create zone manager */
static void
zonemgr_create(void **state)
{
zonemgr_create(void **state) {
dns_zonemgr_t *myzonemgr = NULL;
isc_result_t result;
isc_result_t result;
UNUSED(state);
@@ -76,11 +73,10 @@ zonemgr_create(void **state)
/* manage and release a zone */
static void
zonemgr_managezone(void **state)
{
zonemgr_managezone(void **state) {
dns_zonemgr_t *myzonemgr = NULL;
dns_zone_t * zone = NULL;
isc_result_t result;
dns_zone_t *zone = NULL;
isc_result_t result;
UNUSED(state);
@@ -118,11 +114,10 @@ zonemgr_managezone(void **state)
/* create and release a zone */
static void
zonemgr_createzone(void **state)
{
zonemgr_createzone(void **state) {
dns_zonemgr_t *myzonemgr = NULL;
dns_zone_t * zone = NULL;
isc_result_t result;
dns_zone_t *zone = NULL;
isc_result_t result;
UNUSED(state);
@@ -153,14 +148,13 @@ zonemgr_createzone(void **state)
/* manage and release a zone */
static void
zonemgr_unreachable(void **state)
{
zonemgr_unreachable(void **state) {
dns_zonemgr_t *myzonemgr = NULL;
dns_zone_t * zone = NULL;
dns_zone_t *zone = NULL;
isc_sockaddr_t addr1, addr2;
struct in_addr in;
isc_result_t result;
isc_time_t now;
isc_result_t result;
isc_time_t now;
UNUSED(state);
@@ -241,8 +235,7 @@ zonemgr_unreachable(void **state)
*/
int
main(void)
{
main(void) {
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(zonemgr_create, _setup,
_teardown),
@@ -262,8 +255,7 @@ main(void)
#include <stdio.h>
int
main(void)
{
main(void) {
printf("1..0 # Skipped: cmocka not available\n");
return (0);
}