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:
@@ -29,8 +29,7 @@
|
||||
#include "dnstest.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);
|
||||
|
||||
dns_test_end();
|
||||
@@ -53,13 +51,12 @@ _teardown(void **state)
|
||||
|
||||
/* Test DSCP set/get functions */
|
||||
static void
|
||||
dscp(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
isc_netaddr_t netaddr;
|
||||
dscp(void **state) {
|
||||
isc_result_t result;
|
||||
isc_netaddr_t netaddr;
|
||||
struct in_addr ina;
|
||||
dns_peer_t * peer = NULL;
|
||||
isc_dscp_t dscp;
|
||||
dns_peer_t *peer = NULL;
|
||||
isc_dscp_t dscp;
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -155,8 +152,7 @@ dscp(void **state)
|
||||
}
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
main(void) {
|
||||
const struct CMUnitTest tests[] = {
|
||||
cmocka_unit_test_setup_teardown(dscp, _setup, _teardown),
|
||||
};
|
||||
@@ -169,8 +165,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