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

@@ -40,8 +40,7 @@
#include "../update.c"
static int
_setup(void **state)
{
_setup(void **state) {
isc_result_t result;
UNUSED(state);
@@ -55,8 +54,7 @@ _setup(void **state)
}
static int
_teardown(void **state)
{
_teardown(void **state) {
UNUSED(state);
dns_test_end();
@@ -67,8 +65,7 @@ _teardown(void **state)
static uint32_t mystdtime;
static void
set_mystdtime(int year, int month, int day)
{
set_mystdtime(int year, int month, int day) {
struct tm tm;
memset(&tm, 0, sizeof(tm));
@@ -79,15 +76,13 @@ set_mystdtime(int year, int month, int day)
}
void
isc_stdtime_get(isc_stdtime_t *now)
{
isc_stdtime_get(isc_stdtime_t *now) {
*now = mystdtime;
}
/* simple increment by 1 */
static void
increment_test(void **state)
{
increment_test(void **state) {
uint32_t old = 50;
uint32_t serial;
@@ -101,8 +96,7 @@ increment_test(void **state)
/* increment past zero, 0xfffffffff -> 1 */
static void
increment_past_zero_test(void **state)
{
increment_past_zero_test(void **state) {
uint32_t old = 0xffffffffu;
uint32_t serial;
@@ -116,8 +110,7 @@ increment_past_zero_test(void **state)
/* past to unixtime */
static void
past_to_unix_test(void **state)
{
past_to_unix_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -134,8 +127,7 @@ past_to_unix_test(void **state)
/* now to unixtime */
static void
now_to_unix_test(void **state)
{
now_to_unix_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -152,8 +144,7 @@ now_to_unix_test(void **state)
/* future to unixtime */
static void
future_to_unix_test(void **state)
{
future_to_unix_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -170,8 +161,7 @@ future_to_unix_test(void **state)
/* undefined plus 1 to unixtime */
static void
undefined_plus1_to_unix_test(void **state)
{
undefined_plus1_to_unix_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -189,8 +179,7 @@ undefined_plus1_to_unix_test(void **state)
/* undefined minus 1 to unixtime */
static void
undefined_minus1_to_unix_test(void **state)
{
undefined_minus1_to_unix_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -208,8 +197,7 @@ undefined_minus1_to_unix_test(void **state)
/* undefined to unixtime */
static void
undefined_to_unix_test(void **state)
{
undefined_to_unix_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -226,8 +214,7 @@ undefined_to_unix_test(void **state)
/* handle unixtime being zero */
static void
unixtime_zero_test(void **state)
{
unixtime_zero_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -244,8 +231,7 @@ unixtime_zero_test(void **state)
/* past to date */
static void
past_to_date_test(void **state)
{
past_to_date_test(void **state) {
uint32_t old, serial;
UNUSED(state);
@@ -263,8 +249,7 @@ past_to_date_test(void **state)
/* now to date */
static void
now_to_date_test(void **state)
{
now_to_date_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -281,8 +266,7 @@ now_to_date_test(void **state)
/* future to date */
static void
future_to_date_test(void **state)
{
future_to_date_test(void **state) {
uint32_t old;
uint32_t serial;
@@ -299,8 +283,7 @@ future_to_date_test(void **state)
}
int
main(void)
{
main(void) {
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(increment_test, _setup,
_teardown),
@@ -336,8 +319,7 @@ main(void)
#include <stdio.h>
int
main(void)
{
main(void) {
printf("1..0 # Skipped: cmocka not available\n");
return (0);
}