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

118
lib/dns/tests/rbt_serialize_test.c
View File

@@ -60,8 +60,7 @@
static bool verbose = false;
static int
_setup(void **state)
{
_setup(void **state) {
isc_result_t result;
UNUSED(state);
@@ -73,8 +72,7 @@ _setup(void **state)
}
static int
_teardown(void **state)
{
_teardown(void **state) {
UNUSED(state);
dns_test_end();
@@ -83,13 +81,13 @@ _teardown(void **state)
}
typedef struct data_holder {
int len;
int len;
const char *data;
} data_holder_t;
typedef struct rbt_testdata {
const char * name;
size_t name_len;
const char *name;
size_t name_len;
data_holder_t data;
} rbt_testdata_t;
@@ -123,20 +121,18 @@ rbt_testdata_t testdata[] = { DATA_ITEM("first.com."),
{ NULL, 0, { 0, NULL } } };
static void
delete_data(void *data, void *arg)
{
delete_data(void *data, void *arg) {
UNUSED(arg);
UNUSED(data);
}
static isc_result_t
write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc)
{
isc_result_t result;
size_t ret = 0;
write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc) {
isc_result_t result;
size_t ret = 0;
data_holder_t *data;
data_holder_t temp;
off_t where;
data_holder_t temp;
off_t where;
UNUSED(arg);
@@ -174,10 +170,9 @@ write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc)
}
static isc_result_t
fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, uint64_t *crc)
{
fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, uint64_t *crc) {
data_holder_t *data;
size_t size;
size_t size;
UNUSED(base);
UNUSED(max);
@@ -189,7 +184,8 @@ fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, uint64_t *crc)
data = p->data;
if (data == NULL || (data->len == 0 && data->data != NULL) ||
(data->len != 0 && data->data == NULL)) {
(data->len != 0 && data->data == NULL))
{
return (ISC_R_INVALIDFILE);
}
@@ -217,14 +213,13 @@ fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, uint64_t *crc)
* Load test data into the RBT.
*/
static void
add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt)
{
char buffer[1024];
isc_buffer_t b;
isc_result_t result;
add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt) {
char buffer[1024];
isc_buffer_t b;
isc_result_t result;
dns_fixedname_t fname;
dns_name_t * name;
dns_compress_t cctx;
dns_name_t *name;
dns_compress_t cctx;
rbt_testdata_t *testdatap = testdata;
dns_compress_init(&cctx, -1, mctx);
@@ -255,17 +250,16 @@ add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt)
* Walk the tree and ensure that all the test nodes are present.
*/
static void
check_test_data(dns_rbt_t *rbt)
{
char buffer[1024];
char * arg;
check_test_data(dns_rbt_t *rbt) {
char buffer[1024];
char *arg;
dns_fixedname_t fname;
dns_fixedname_t fixed;
dns_name_t * name;
isc_buffer_t b;
data_holder_t * data;
isc_result_t result;
dns_name_t * foundname;
dns_name_t *name;
isc_buffer_t b;
data_holder_t *data;
isc_result_t result;
dns_name_t *foundname;
rbt_testdata_t *testdatap = testdata;
foundname = dns_fixedname_initname(&fixed);
@@ -293,8 +287,7 @@ check_test_data(dns_rbt_t *rbt)
}
static void
data_printer(FILE *out, void *datap)
{
data_printer(FILE *out, void *datap) {
data_holder_t *data = (data_holder_t *)datap;
fprintf(out, "%d bytes, %s", data->len, data->data);
@@ -302,16 +295,15 @@ data_printer(FILE *out, void *datap)
/* Test writing an rbt to file */
static void
serialize_test(void **state)
{
dns_rbt_t * rbt = NULL;
serialize_test(void **state) {
dns_rbt_t *rbt = NULL;
isc_result_t result;
FILE * rbtfile = NULL;
dns_rbt_t * rbt_deserialized = NULL;
off_t offset;
int fd;
off_t filesize = 0;
char * base;
FILE *rbtfile = NULL;
dns_rbt_t *rbt_deserialized = NULL;
off_t offset;
int fd;
off_t filesize = 0;
char *base;
UNUSED(state);
@@ -331,8 +323,8 @@ serialize_test(void **state)
*/
rbtfile = fopen("./zone.bin", "w+b");
assert_non_null(rbtfile);
result =
dns_rbt_serialize_tree(rbtfile, rbt, write_data, NULL, &offset);
result = dns_rbt_serialize_tree(rbtfile, rbt, write_data, NULL,
&offset);
assert_true(result == ISC_R_SUCCESS);
dns_rbt_destroy(&rbt);
@@ -371,16 +363,15 @@ serialize_test(void **state)
/* Test reading a corrupt map file */
static void
deserialize_corrupt_test(void **state)
{
dns_rbt_t * rbt = NULL;
deserialize_corrupt_test(void **state) {
dns_rbt_t *rbt = NULL;
isc_result_t result;
FILE * rbtfile = NULL;
off_t offset;
int fd;
off_t filesize = 0;
char * base, *p, *q;
int i;
FILE *rbtfile = NULL;
off_t offset;
int fd;
off_t filesize = 0;
char *base, *p, *q;
int i;
UNUSED(state);
@@ -393,8 +384,8 @@ deserialize_corrupt_test(void **state)
add_test_data(dt_mctx, rbt);
rbtfile = fopen("./zone.bin", "w+b");
assert_non_null(rbtfile);
result =
dns_rbt_serialize_tree(rbtfile, rbt, write_data, NULL, &offset);
result = dns_rbt_serialize_tree(rbtfile, rbt, write_data, NULL,
&offset);
assert_true(result == ISC_R_SUCCESS);
dns_rbt_destroy(&rbt);
@@ -443,8 +434,7 @@ deserialize_corrupt_test(void **state)
/* Test the dns_rbt_serialize_align() function */
static void
serialize_align_test(void **state)
{
serialize_align_test(void **state) {
UNUSED(state);
assert_true(dns_rbt_serialize_align(0) == 0);
@@ -462,8 +452,7 @@ serialize_align_test(void **state)
}
int
main(int argc, char **argv)
{
main(int argc, char **argv) {
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(serialize_test, _setup,
_teardown),
@@ -491,8 +480,7 @@ main(int argc, char **argv)
#include <stdio.h>
int
main(void)
{
main(void) {
printf("1..0 # Skipped: cmocka not available\n");
return (0);
}