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:
@@ -32,8 +32,7 @@
|
||||
#define TEST_ORIGIN "test"
|
||||
|
||||
static int
|
||||
_setup(void **state)
|
||||
{
|
||||
_setup(void **state) {
|
||||
isc_result_t result;
|
||||
|
||||
UNUSED(state);
|
||||
@@ -45,8 +44,7 @@ _setup(void **state)
|
||||
}
|
||||
|
||||
static int
|
||||
_teardown(void **state)
|
||||
{
|
||||
_teardown(void **state) {
|
||||
UNUSED(state);
|
||||
|
||||
dns_test_end();
|
||||
@@ -56,14 +54,13 @@ _teardown(void **state)
|
||||
|
||||
/* value = 0xfffffffff <-> 19691231235959 */
|
||||
static void
|
||||
epoch_minus_one_test(void **state)
|
||||
{
|
||||
const char * test_text = "19691231235959";
|
||||
epoch_minus_one_test(void **state) {
|
||||
const char *test_text = "19691231235959";
|
||||
const uint32_t test_time = 0xffffffff;
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -79,14 +76,13 @@ epoch_minus_one_test(void **state)
|
||||
|
||||
/* value = 0x000000000 <-> 19700101000000*/
|
||||
static void
|
||||
epoch_test(void **state)
|
||||
{
|
||||
const char * test_text = "19700101000000";
|
||||
epoch_test(void **state) {
|
||||
const char *test_text = "19700101000000";
|
||||
const uint32_t test_time = 0x00000000;
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -102,14 +98,13 @@ epoch_test(void **state)
|
||||
|
||||
/* value = 0x7fffffff <-> 20380119031407 */
|
||||
static void
|
||||
half_maxint_test(void **state)
|
||||
{
|
||||
const char * test_text = "20380119031407";
|
||||
half_maxint_test(void **state) {
|
||||
const char *test_text = "20380119031407";
|
||||
const uint32_t test_time = 0x7fffffff;
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -125,14 +120,13 @@ half_maxint_test(void **state)
|
||||
|
||||
/* value = 0x80000000 <-> 20380119031408 */
|
||||
static void
|
||||
half_plus_one_test(void **state)
|
||||
{
|
||||
const char * test_text = "20380119031408";
|
||||
half_plus_one_test(void **state) {
|
||||
const char *test_text = "20380119031408";
|
||||
const uint32_t test_time = 0x80000000;
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -148,14 +142,13 @@ half_plus_one_test(void **state)
|
||||
|
||||
/* value = 0xef68f5d0 <-> 19610307130000 */
|
||||
static void
|
||||
fifty_before_test(void **state)
|
||||
{
|
||||
isc_result_t result;
|
||||
const char * test_text = "19610307130000";
|
||||
fifty_before_test(void **state) {
|
||||
isc_result_t result;
|
||||
const char *test_text = "19610307130000";
|
||||
const uint32_t test_time = 0xef68f5d0;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -171,14 +164,13 @@ fifty_before_test(void **state)
|
||||
|
||||
/* value = 0x4d74d6d0 <-> 20110307130000 */
|
||||
static void
|
||||
some_ago_test(void **state)
|
||||
{
|
||||
const char * test_text = "20110307130000";
|
||||
some_ago_test(void **state) {
|
||||
const char *test_text = "20110307130000";
|
||||
const uint32_t test_time = 0x4d74d6d0;
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
isc_result_t result;
|
||||
isc_buffer_t target;
|
||||
uint32_t when;
|
||||
char buf[128];
|
||||
|
||||
UNUSED(state);
|
||||
|
||||
@@ -193,8 +185,7 @@ some_ago_test(void **state)
|
||||
}
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
main(void) {
|
||||
const struct CMUnitTest tests[] = {
|
||||
cmocka_unit_test_setup_teardown(epoch_minus_one_test, _setup,
|
||||
_teardown),
|
||||
@@ -217,8 +208,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