ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'each-style-tweak' into 'master'

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

135
lib/dns/tests/dbiterator_test.c
View File

@@ -30,13 +30,12 @@
#include "dnstest.h"
#define BUFLEN 255
#define BIGBUFLEN (64 * 1024)
#define BUFLEN 255
#define BIGBUFLEN (64 * 1024)
#define TEST_ORIGIN "test"
static int
_setup(void **state)
{
_setup(void **state) {
isc_result_t result;
UNUSED(state);
@@ -48,8 +47,7 @@ _setup(void **state)
}
static int
_teardown(void **state)
{
_teardown(void **state) {
UNUSED(state);
dns_test_end();
@@ -58,8 +56,7 @@ _teardown(void **state)
}
static isc_result_t
make_name(const char *src, dns_name_t *name)
{
make_name(const char *src, dns_name_t *name) {
isc_buffer_t b;
isc_buffer_constinit(&b, src, strlen(src));
isc_buffer_add(&b, strlen(src));
@@ -68,10 +65,9 @@ make_name(const char *src, dns_name_t *name)
/* create: make sure we can create a dbiterator */
static void
test_create(const char *filename)
{
isc_result_t result;
dns_db_t * db = NULL;
test_create(const char *filename) {
isc_result_t result;
dns_db_t *db = NULL;
dns_dbiterator_t *iter = NULL;
result = dns_test_loaddb(&db, dns_dbtype_cache, TEST_ORIGIN, filename);
@@ -85,16 +81,14 @@ test_create(const char *filename)
}
static void
create(void **state)
{
create(void **state) {
UNUSED(state);
test_create("testdata/dbiterator/zone1.data");
}
static void
create_nsec3(void **state)
{
create_nsec3(void **state) {
UNUSED(state);
test_create("testdata/dbiterator/zone2.data");
@@ -102,15 +96,14 @@ create_nsec3(void **state)
/* walk: walk a database */
static void
test_walk(const char *filename, int nodes)
{
isc_result_t result;
dns_db_t * db = NULL;
test_walk(const char *filename, int nodes) {
isc_result_t result;
dns_db_t *db = NULL;
dns_dbiterator_t *iter = NULL;
dns_dbnode_t * node = NULL;
dns_name_t * name;
dns_fixedname_t f;
int i = 0;
dns_dbnode_t *node = NULL;
dns_name_t *name;
dns_fixedname_t f;
int i = 0;
name = dns_fixedname_initname(&f);
@@ -121,7 +114,8 @@ test_walk(const char *filename, int nodes)
assert_int_equal(result, ISC_R_SUCCESS);
for (result = dns_dbiterator_first(iter); result == ISC_R_SUCCESS;
result = dns_dbiterator_next(iter)) {
result = dns_dbiterator_next(iter))
{
result = dns_dbiterator_current(iter, &node, name);
if (result == DNS_R_NEWORIGIN) {
result = ISC_R_SUCCESS;
@@ -138,16 +132,14 @@ test_walk(const char *filename, int nodes)
}
static void
walk(void **state)
{
walk(void **state) {
UNUSED(state);
test_walk("testdata/dbiterator/zone1.data", 12);
}
static void
walk_nsec3(void **state)
{
walk_nsec3(void **state) {
UNUSED(state);
test_walk("testdata/dbiterator/zone2.data", 33);
@@ -155,15 +147,14 @@ walk_nsec3(void **state)
/* reverse: walk database backwards */
static void
test_reverse(const char *filename)
{
isc_result_t result;
dns_db_t * db = NULL;
test_reverse(const char *filename) {
isc_result_t result;
dns_db_t *db = NULL;
dns_dbiterator_t *iter = NULL;
dns_dbnode_t * node = NULL;
dns_name_t * name;
dns_fixedname_t f;
int i = 0;
dns_dbnode_t *node = NULL;
dns_name_t *name;
dns_fixedname_t f;
int i = 0;
name = dns_fixedname_initname(&f);
@@ -174,7 +165,8 @@ test_reverse(const char *filename)
assert_int_equal(result, ISC_R_SUCCESS);
for (result = dns_dbiterator_last(iter); result == ISC_R_SUCCESS;
result = dns_dbiterator_prev(iter)) {
result = dns_dbiterator_prev(iter))
{
result = dns_dbiterator_current(iter, &node, name);
if (result == DNS_R_NEWORIGIN) {
result = ISC_R_SUCCESS;
@@ -191,16 +183,14 @@ test_reverse(const char *filename)
}
static void
reverse(void **state)
{
reverse(void **state) {
UNUSED(state);
test_reverse("testdata/dbiterator/zone1.data");
}
static void
reverse_nsec3(void **state)
{
reverse_nsec3(void **state) {
UNUSED(state);
test_reverse("testdata/dbiterator/zone2.data");
@@ -208,15 +198,14 @@ reverse_nsec3(void **state)
/* seek: walk database starting at a particular node */
static void
test_seek_node(const char *filename, int nodes)
{
isc_result_t result;
dns_db_t * db = NULL;
test_seek_node(const char *filename, int nodes) {
isc_result_t result;
dns_db_t *db = NULL;
dns_dbiterator_t *iter = NULL;
dns_dbnode_t * node = NULL;
dns_name_t * name, *seekname;
dns_fixedname_t f1, f2;
int i = 0;
dns_dbnode_t *node = NULL;
dns_name_t *name, *seekname;
dns_fixedname_t f1, f2;
int i = 0;
name = dns_fixedname_initname(&f1);
seekname = dns_fixedname_initname(&f2);
@@ -251,16 +240,14 @@ test_seek_node(const char *filename, int nodes)
}
static void
seek_node(void **state)
{
seek_node(void **state) {
UNUSED(state);
test_seek_node("testdata/dbiterator/zone1.data", 9);
}
static void
seek_node_nsec3(void **state)
{
seek_node_nsec3(void **state) {
UNUSED(state);
test_seek_node("testdata/dbiterator/zone2.data", 30);
@@ -271,13 +258,12 @@ seek_node_nsec3(void **state)
* (should fail)
*/
static void
test_seek_empty(const char *filename)
{
isc_result_t result;
dns_db_t * db = NULL;
test_seek_empty(const char *filename) {
isc_result_t result;
dns_db_t *db = NULL;
dns_dbiterator_t *iter = NULL;
dns_name_t * seekname;
dns_fixedname_t f1;
dns_name_t *seekname;
dns_fixedname_t f1;
seekname = dns_fixedname_initname(&f1);
@@ -298,16 +284,14 @@ test_seek_empty(const char *filename)
}
static void
seek_empty(void **state)
{
seek_empty(void **state) {
UNUSED(state);
test_seek_empty("testdata/dbiterator/zone1.data");
}
static void
seek_empty_nsec3(void **state)
{
seek_empty_nsec3(void **state) {
UNUSED(state);
test_seek_empty("testdata/dbiterator/zone2.data");
@@ -317,13 +301,12 @@ seek_empty_nsec3(void **state)
* seek_nx: walk database starting at a nonexistent node
*/
static void
test_seek_nx(const char *filename)
{
isc_result_t result;
dns_db_t * db = NULL;
test_seek_nx(const char *filename) {
isc_result_t result;
dns_db_t *db = NULL;
dns_dbiterator_t *iter = NULL;
dns_name_t * seekname;
dns_fixedname_t f1;
dns_name_t *seekname;
dns_fixedname_t f1;
seekname = dns_fixedname_initname(&f1);
@@ -350,16 +333,14 @@ test_seek_nx(const char *filename)
}
static void
seek_nx(void **state)
{
seek_nx(void **state) {
UNUSED(state);
test_seek_nx("testdata/dbiterator/zone1.data");
}
static void
seek_nx_nsec3(void **state)
{
seek_nx_nsec3(void **state) {
UNUSED(state);
test_seek_nx("testdata/dbiterator/zone2.data");
@@ -374,8 +355,7 @@ seek_nx_nsec3(void **state)
* dns_dbiterator_setcleanmode
*/
int
main(void)
{
main(void) {
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(create, _setup, _teardown),
cmocka_unit_test_setup_teardown(create_nsec3, _setup,
@@ -404,8 +384,7 @@ main(void)
#include <stdio.h>
int
main(void)
{
main(void) {
printf("1..0 # Skipped: cmocka not available\n");
return (0);
}