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

Merge branch '46-just-use-clang-format-to-reformat-sources' into 'master'

Browse Source 
Reformat source code with clang-format

Closes #46

See merge request isc-projects/bind9!2156

(cherry picked from commit 7099e79a9b)

4c3b063e Import Linux kernel .clang-format with small modifications
f50b1e06 Use clang-format to reformat the source files
11341c76 Update the definition files for Windows
df6c1f76 Remove tkey_test (which is no-op anyway)
This commit is contained in:
Ondřej Surý
2020-02-12 14:33:32 +00:00
parent dbe15330fe
commit c931d8e417
974 changed files with 75952 additions and 74434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/dns/tests/nsec3_test.c
View File

@@ -11,11 +11,10 @@
#if HAVE_CMOCKA
#include <sched.h> /* IWYU pragma: keep */
#include <setjmp.h>
#include <stdarg.h>
#include <stddef.h>
#include <setjmp.h>
#include <sched.h> /* IWYU pragma: keep */
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -23,8 +22,8 @@
#define UNIT_TESTING
#include <cmocka.h>
#include <isc/util.h>
#include <isc/string.h>
#include <isc/util.h>
#include <dns/db.h>
#include <dns/nsec3.h>
@@ -32,7 +31,8 @@
#include "dnstest.h"
static int
_setup(void **state) {
_setup(void **state)
{
isc_result_t result;
UNUSED(state);
@@ -44,7 +44,8 @@ _setup(void **state) {
}
static int
_teardown(void **state) {
_teardown(void **state)
{
UNUSED(state);
dns_test_end();
@@ -53,9 +54,10 @@ _teardown(void **state) {
}
static void
iteration_test(const char *file, unsigned int expected) {
iteration_test(const char *file, unsigned int expected)
{
isc_result_t result;
dns_db_t *db = NULL;
dns_db_t * db = NULL;
unsigned int iterations;
result = dns_test_loaddb(&db, dns_dbtype_zone, "test", file);
@@ -73,8 +75,8 @@ iteration_test(const char *file, unsigned int expected) {
* Structure containing parameters for nsec3param_salttotext_test().
*/
typedef struct {
const char *nsec3param_text; /* NSEC3PARAM RDATA in text form */
const char *expected_salt; /* string expected in target buffer */
const char *nsec3param_text; /* NSEC3PARAM RDATA in text form */
const char *expected_salt; /* string expected in target buffer */
} nsec3param_salttotext_test_params_t;
/*%
@@ -86,21 +88,21 @@ typedef struct {
* invalid NSEC3PARAM RDATA is out of scope of this unit test.
*/
static void
nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params) {
dns_rdata_t rdata = DNS_RDATA_INIT;
nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params)
{
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdata_nsec3param_t nsec3param;
unsigned char buf[1024];
isc_result_t result;
char salt[64];
size_t length;
unsigned char buf[1024];
isc_result_t result;
char salt[64];
size_t length;
/*
* Prepare a dns_rdata_nsec3param_t structure for testing.
*/
result = dns_test_rdatafromstring(&rdata, dns_rdataclass_in,
dns_rdatatype_nsec3param, buf,
sizeof(buf),
params->nsec3param_text, false);
result = dns_test_rdatafromstring(
&rdata, dns_rdataclass_in, dns_rdatatype_nsec3param, buf,
sizeof(buf), params->nsec3param_text, false);
assert_int_equal(result, ISC_R_SUCCESS);
result = dns_rdata_tostruct(&rdata, &nsec3param, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
@@ -118,7 +120,7 @@ nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params) {
* terminating NULL byte.
*/
length = strlen(params->expected_salt);
assert_true(length < sizeof(salt) - 1); /* prevent buffer overwrite */
assert_true(length < sizeof(salt) - 1); /* prevent buffer overwrite */
assert_true(length > 0U); /* prevent length underflow */
result = dns_nsec3param_salttotext(&nsec3param, salt, length - 1);
@@ -136,7 +138,8 @@ nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params) {
* key size mixes
*/
static void
max_iterations(void **state) {
max_iterations(void **state)
{
UNUSED(state);
iteration_test("testdata/nsec3/1024.db", 150);
@@ -148,7 +151,8 @@ max_iterations(void **state) {
/* check dns_nsec3param_salttotext() */
static void
nsec3param_salttotext(void **state) {
nsec3param_salttotext(void **state)
{
size_t i;
const nsec3param_salttotext_test_params_t tests[] = {
@@ -173,12 +177,13 @@ nsec3param_salttotext(void **state) {
}
int
main(void) {
main(void)
{
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(max_iterations,
_setup, _teardown),
cmocka_unit_test_setup_teardown(nsec3param_salttotext,
_setup, _teardown),
cmocka_unit_test_setup_teardown(max_iterations, _setup,
_teardown),
cmocka_unit_test_setup_teardown(nsec3param_salttotext, _setup,
_teardown),
};
return (cmocka_run_group_tests(tests, NULL, NULL));
@@ -189,7 +194,8 @@ main(void) {
#include <stdio.h>
int
main(void) {
main(void)
{
printf("1..0 # Skipped: cmocka not available\n");
return (0);
}