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 commitd3b49b6675)0255a974revise .clang-format and add a C formatting script in utile851ed0bapply the modified style
This commit is contained in:
@@ -30,8 +30,7 @@
|
||||
#include "isctest.h"
|
||||
|
||||
static int
|
||||
_setup(void **state)
|
||||
{
|
||||
_setup(void **state) {
|
||||
isc_result_t result;
|
||||
|
||||
UNUSED(state);
|
||||
@@ -43,8 +42,7 @@ _setup(void **state)
|
||||
}
|
||||
|
||||
static int
|
||||
_teardown(void **state)
|
||||
{
|
||||
_teardown(void **state) {
|
||||
UNUSED(state);
|
||||
|
||||
isc_test_end();
|
||||
@@ -58,8 +56,7 @@ struct e {
|
||||
};
|
||||
|
||||
static bool
|
||||
compare(void *p1, void *p2)
|
||||
{
|
||||
compare(void *p1, void *p2) {
|
||||
struct e *e1 = p1;
|
||||
struct e *e2 = p2;
|
||||
|
||||
@@ -67,8 +64,7 @@ compare(void *p1, void *p2)
|
||||
}
|
||||
|
||||
static void
|
||||
idx(void *p, unsigned int i)
|
||||
{
|
||||
idx(void *p, unsigned int i) {
|
||||
struct e *e = p;
|
||||
|
||||
e->index = i;
|
||||
@@ -76,11 +72,10 @@ idx(void *p, unsigned int i)
|
||||
|
||||
/* test isc_heap_delete() */
|
||||
static void
|
||||
isc_heap_delete_test(void **state)
|
||||
{
|
||||
isc_heap_t * heap = NULL;
|
||||
isc_heap_delete_test(void **state) {
|
||||
isc_heap_t *heap = NULL;
|
||||
isc_result_t result;
|
||||
struct e e1 = { 100, 0 };
|
||||
struct e e1 = { 100, 0 };
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -100,8 +95,7 @@ isc_heap_delete_test(void **state)
|
||||
}
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
main(void) {
|
||||
const struct CMUnitTest tests[] = {
|
||||
cmocka_unit_test(isc_heap_delete_test),
|
||||
};
|
||||
@@ -114,8 +108,7 @@ main(void)
|
||||
#include <stdio.h>
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
main(void) {
|
||||
printf("1..0 # Skipped: cmocka not available\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user