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

199
bin/tests/system/dyndb/driver/db.c
View File

@@ -37,8 +37,8 @@
((sampledb) != NULL && (sampledb)->common.impmagic == SAMPLEDB_MAGIC)
struct sampledb {
dns_db_t common;
isc_refcount_t refs;
dns_db_t common;
isc_refcount_t refs;
sample_instance_t *inst;
/*
@@ -61,15 +61,13 @@ typedef struct sampledb sampledb_t;
* This should work as long as we use only RBTDB and nothing else.
*/
static isc_result_t
sample_name_fromnode(dns_dbnode_t *node, dns_name_t *name)
{
sample_name_fromnode(dns_dbnode_t *node, dns_name_t *name) {
dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node;
return (dns_rbt_fullnamefromnode(rbtnode, name));
}
static void
attach(dns_db_t *source, dns_db_t **targetp)
{
attach(dns_db_t *source, dns_db_t **targetp) {
sampledb_t *sampledb = (sampledb_t *)source;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -79,8 +77,7 @@ attach(dns_db_t *source, dns_db_t **targetp)
}
static void
free_sampledb(sampledb_t *sampledb)
{
free_sampledb(sampledb_t *sampledb) {
REQUIRE(VALID_SAMPLEDB(sampledb));
dns_db_detach(&sampledb->rbtdb);
@@ -90,8 +87,7 @@ free_sampledb(sampledb_t *sampledb)
}
static void
detach(dns_db_t **dbp)
{
detach(dns_db_t **dbp) {
REQUIRE(dbp != NULL && VALID_SAMPLEDB((sampledb_t *)(*dbp)));
sampledb_t *sampledb = (sampledb_t *)(*dbp);
*dbp = NULL;
@@ -107,8 +103,7 @@ detach(dns_db_t **dbp)
* loaded in the usual sense.
*/
static isc_result_t
beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks)
{
beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) {
UNUSED(db);
UNUSED(callbacks);
@@ -124,8 +119,7 @@ beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks)
* loaded in the usual sense.
*/
static isc_result_t
endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks)
{
endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) {
UNUSED(db);
UNUSED(callbacks);
@@ -136,8 +130,7 @@ endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks)
}
static isc_result_t
serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file)
{
serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -147,8 +140,7 @@ serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file)
static isc_result_t
dump(dns_db_t *db, dns_dbversion_t *version, const char *filename,
dns_masterformat_t masterformat)
{
dns_masterformat_t masterformat) {
UNUSED(db);
UNUSED(version);
UNUSED(filename);
@@ -161,8 +153,7 @@ dump(dns_db_t *db, dns_dbversion_t *version, const char *filename,
}
static void
currentversion(dns_db_t *db, dns_dbversion_t **versionp)
{
currentversion(dns_db_t *db, dns_dbversion_t **versionp) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -171,8 +162,7 @@ currentversion(dns_db_t *db, dns_dbversion_t **versionp)
}
static isc_result_t
newversion(dns_db_t *db, dns_dbversion_t **versionp)
{
newversion(dns_db_t *db, dns_dbversion_t **versionp) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -181,8 +171,8 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp)
}
static void
attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp)
{
attachversion(dns_db_t *db, dns_dbversion_t *source,
dns_dbversion_t **targetp) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -191,8 +181,7 @@ attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp)
}
static void
closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit)
{
closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -202,8 +191,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit)
static isc_result_t
findnode(dns_db_t *db, const dns_name_t *name, bool create,
dns_dbnode_t **nodep)
{
dns_dbnode_t **nodep) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -215,8 +203,7 @@ static isc_result_t
find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
dns_rdatatype_t type, unsigned int options, isc_stdtime_t now,
dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset)
{
dns_rdataset_t *sigrdataset) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -229,8 +216,7 @@ static isc_result_t
findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options,
isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname,
dns_name_t *dcname, dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset)
{
dns_rdataset_t *sigrdataset) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -240,8 +226,7 @@ findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options,
}
static void
attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp)
{
attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -250,8 +235,7 @@ attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp)
}
static void
detachnode(dns_db_t *db, dns_dbnode_t **targetp)
{
detachnode(dns_db_t *db, dns_dbnode_t **targetp) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -260,8 +244,7 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp)
}
static isc_result_t
expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now)
{
expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -270,8 +253,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now)
}
static void
printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out)
{
printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -280,8 +262,8 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out)
}
static isc_result_t
createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp)
{
createiterator(dns_db_t *db, unsigned int options,
dns_dbiterator_t **iteratorp) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -292,8 +274,7 @@ createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp)
static isc_result_t
findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
dns_rdatatype_t type, dns_rdatatype_t covers, isc_stdtime_t now,
dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset)
{
dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -304,8 +285,7 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
static isc_result_t
allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
isc_stdtime_t now, dns_rdatasetiter_t **iteratorp)
{
isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -317,10 +297,9 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
static isc_result_t
addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
isc_stdtime_t now, dns_rdataset_t *rdataset, unsigned int options,
dns_rdataset_t *addedrdataset)
{
sampledb_t * sampledb = (sampledb_t *)db;
isc_result_t result;
dns_rdataset_t *addedrdataset) {
sampledb_t *sampledb = (sampledb_t *)db;
isc_result_t result;
dns_fixedname_t name;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -342,10 +321,9 @@ cleanup:
static isc_result_t
subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
dns_rdataset_t *rdataset, unsigned int options,
dns_rdataset_t *newrdataset)
{
sampledb_t * sampledb = (sampledb_t *)db;
isc_result_t result;
dns_rdataset_t *newrdataset) {
sampledb_t *sampledb = (sampledb_t *)db;
isc_result_t result;
dns_fixedname_t name;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -374,8 +352,7 @@ cleanup:
*/
static isc_result_t
deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
dns_rdatatype_t type, dns_rdatatype_t covers)
{
dns_rdatatype_t type, dns_rdatatype_t covers) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -385,8 +362,7 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
}
static bool
issecure(dns_db_t *db)
{
issecure(dns_db_t *db) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -395,8 +371,7 @@ issecure(dns_db_t *db)
}
static unsigned int
nodecount(dns_db_t *db)
{
nodecount(dns_db_t *db) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -409,16 +384,14 @@ nodecount(dns_db_t *db)
* Always return true.
*/
static bool
ispersistent(dns_db_t *db)
{
ispersistent(dns_db_t *db) {
UNUSED(db);
return (true);
}
static void
overmem(dns_db_t *db, bool over)
{
overmem(dns_db_t *db, bool over) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -427,8 +400,7 @@ overmem(dns_db_t *db, bool over)
}
static void
settask(dns_db_t *db, isc_task_t *task)
{
settask(dns_db_t *db, isc_task_t *task) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -437,8 +409,7 @@ settask(dns_db_t *db, isc_task_t *task)
}
static isc_result_t
getoriginnode(dns_db_t *db, dns_dbnode_t **nodep)
{
getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -447,8 +418,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep)
}
static void
transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp)
{
transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -459,8 +429,7 @@ transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp)
static isc_result_t
getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash,
uint8_t *flags, uint16_t *iterations, unsigned char *salt,
size_t *salt_length)
{
size_t *salt_length) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -471,8 +440,7 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash,
static isc_result_t
findnsec3node(dns_db_t *db, const dns_name_t *name, bool create,
dns_dbnode_t **nodep)
{
dns_dbnode_t **nodep) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -481,8 +449,7 @@ findnsec3node(dns_db_t *db, const dns_name_t *name, bool create,
}
static isc_result_t
setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign)
{
setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -491,8 +458,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign)
}
static isc_result_t
getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name)
{
getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -501,8 +467,7 @@ getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name)
}
static void
resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version)
{
resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -511,8 +476,7 @@ resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version)
}
static bool
isdnssec(dns_db_t *db)
{
isdnssec(dns_db_t *db) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -521,8 +485,7 @@ isdnssec(dns_db_t *db)
}
static dns_stats_t *
getrrsetstats(dns_db_t *db)
{
getrrsetstats(dns_db_t *db) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -533,8 +496,7 @@ getrrsetstats(dns_db_t *db)
static isc_result_t
findnodeext(dns_db_t *db, const dns_name_t *name, bool create,
dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo,
dns_dbnode_t **nodep)
{
dns_dbnode_t **nodep) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -548,8 +510,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
dns_rdatatype_t type, unsigned int options, isc_stdtime_t now,
dns_dbnode_t **nodep, dns_name_t *foundname,
dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo,
dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset)
{
dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -560,8 +521,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
}
static isc_result_t
setcachestats(dns_db_t *db, isc_stats_t *stats)
{
setcachestats(dns_db_t *db, isc_stats_t *stats) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -570,8 +530,7 @@ setcachestats(dns_db_t *db, isc_stats_t *stats)
}
static size_t
hashsize(dns_db_t *db)
{
hashsize(dns_db_t *db) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -647,14 +606,13 @@ static dns_dbmethods_t sampledb_methods = {
*/
static isc_result_t
add_soa(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
const dns_name_t *origin, const dns_name_t *contact)
{
dns_dbnode_t * node = NULL;
dns_rdata_t rdata = DNS_RDATA_INIT;
const dns_name_t *origin, const dns_name_t *contact) {
dns_dbnode_t *node = NULL;
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdatalist_t rdatalist;
dns_rdataset_t rdataset;
isc_result_t result;
unsigned char buf[DNS_SOA_BUFFERSIZE];
dns_rdataset_t rdataset;
isc_result_t result;
unsigned char buf[DNS_SOA_BUFFERSIZE];
dns_rdataset_init(&rdataset);
dns_rdatalist_init(&rdatalist);
@@ -677,16 +635,15 @@ cleanup:
static isc_result_t
add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
const dns_name_t *nsname)
{
dns_dbnode_t * node = NULL;
dns_rdata_ns_t ns;
dns_rdata_t rdata = DNS_RDATA_INIT;
const dns_name_t *nsname) {
dns_dbnode_t *node = NULL;
dns_rdata_ns_t ns;
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdatalist_t rdatalist;
dns_rdataset_t rdataset;
isc_result_t result;
isc_buffer_t b;
unsigned char buf[DNS_NAME_MAXWIRE];
dns_rdataset_t rdataset;
isc_result_t result;
isc_buffer_t b;
unsigned char buf[DNS_NAME_MAXWIRE];
isc_buffer_init(&b, buf, sizeof(buf));
@@ -716,16 +673,15 @@ cleanup:
static isc_result_t
add_a(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
struct in_addr addr)
{
dns_dbnode_t * node = NULL;
struct in_addr addr) {
dns_dbnode_t *node = NULL;
dns_rdata_in_a_t a;
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdatalist_t rdatalist;
dns_rdataset_t rdataset;
isc_result_t result;
isc_buffer_t b;
unsigned char buf[DNS_NAME_MAXWIRE];
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdatalist_t rdatalist;
dns_rdataset_t rdataset;
isc_result_t result;
isc_buffer_t b;
unsigned char buf[DNS_NAME_MAXWIRE];
isc_buffer_init(&b, buf, sizeof(buf));
@@ -760,12 +716,11 @@ cleanup:
isc_result_t
create_db(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
dns_rdataclass_t rdclass, unsigned int argc, char *argv[],
void *driverarg, dns_db_t **dbp)
{
sampledb_t * sampledb = NULL;
isc_result_t result;
void *driverarg, dns_db_t **dbp) {
sampledb_t *sampledb = NULL;
isc_result_t result;
dns_dbversion_t *version = NULL;
struct in_addr a_addr;
struct in_addr a_addr;
REQUIRE(type == dns_dbtype_zone);
REQUIRE(rdclass == dns_rdataclass_in);

25
bin/tests/system/dyndb/driver/driver.c
View File

@@ -31,9 +31,9 @@
#include "log.h"
#include "util.h"
dns_dyndb_destroy_t dyndb_destroy;
dns_dyndb_destroy_t dyndb_destroy;
dns_dyndb_register_t dyndb_init;
dns_dyndb_version_t dyndb_version;
dns_dyndb_version_t dyndb_version;
/*
* Driver init is called for each dyndb section in named.conf
@@ -58,12 +58,11 @@ dns_dyndb_version_t dyndb_version;
isc_result_t
dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters,
const char *file, unsigned long line, const dns_dyndbctx_t *dctx,
void **instp)
{
isc_result_t result;
unsigned int argc;
char ** argv = NULL;
char * s = NULL;
void **instp) {
isc_result_t result;
unsigned int argc;
char **argv = NULL;
char *s = NULL;
sample_instance_t *sample_inst = NULL;
REQUIRE(name != NULL);
@@ -95,8 +94,8 @@ dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters,
name, file, line);
/* Finally, create the instance. */
result =
new_sample_instance(mctx, name, argc, argv, dctx, &sample_inst);
result = new_sample_instance(mctx, name, argc, argv, dctx,
&sample_inst);
if (result != ISC_R_SUCCESS) {
log_write(ISC_LOG_ERROR,
"dyndb_init: new_sample_instance -> %s\n",
@@ -134,8 +133,7 @@ cleanup:
* @param[out] instp Pointer to instance-specific data (for one dyndb section).
*/
void
dyndb_destroy(void **instp)
{
dyndb_destroy(void **instp) {
destroy_sample_instance((sample_instance_t **)instp);
}
@@ -144,8 +142,7 @@ dyndb_destroy(void **instp)
* is no API mismatch betwen the driver and the caller.
*/
int
dyndb_version(unsigned int *flags)
{
dyndb_version(unsigned int *flags) {
UNUSED(flags);
return (DNS_DYNDB_VERSION);

16
bin/tests/system/dyndb/driver/instance.c
View File

@@ -36,10 +36,9 @@
*/
static isc_result_t
parse_params(isc_mem_t *mctx, int argc, char **argv, dns_name_t *z1,
dns_name_t *z2)
{
dns_name_t *z2) {
isc_result_t result;
int i;
int i;
REQUIRE(argv != NULL);
REQUIRE(z1 != NULL);
@@ -84,9 +83,8 @@ cleanup:
isc_result_t
new_sample_instance(isc_mem_t *mctx, const char *db_name, int argc, char **argv,
const dns_dyndbctx_t *dctx,
sample_instance_t ** sample_instp)
{
isc_result_t result;
sample_instance_t **sample_instp) {
isc_result_t result;
sample_instance_t *inst = NULL;
REQUIRE(sample_instp != NULL && *sample_instp == NULL);
@@ -137,8 +135,7 @@ cleanup:
* and add them to inst->view.
*/
isc_result_t
load_sample_instance_zones(sample_instance_t *inst)
{
load_sample_instance_zones(sample_instance_t *inst) {
isc_result_t result;
result = create_zone(inst, inst->zone1_name, &inst->zone1);
@@ -176,8 +173,7 @@ cleanup:
}
void
destroy_sample_instance(sample_instance_t **instp)
{
destroy_sample_instance(sample_instance_t **instp) {
sample_instance_t *inst;
REQUIRE(instp != NULL);

6
bin/tests/system/dyndb/driver/lock.c
View File

@@ -29,8 +29,7 @@
* @param[in,out] statep Lock state: ISC_R_SUCCESS or ISC_R_LOCKBUSY
*/
void
run_exclusive_enter(sample_instance_t *inst, isc_result_t *statep)
{
run_exclusive_enter(sample_instance_t *inst, isc_result_t *statep) {
REQUIRE(statep != NULL);
REQUIRE(*statep == ISC_R_IGNORE);
@@ -45,8 +44,7 @@ run_exclusive_enter(sample_instance_t *inst, isc_result_t *statep)
* @param[in] state Lock state as returned by run_exclusive_enter().
*/
void
run_exclusive_exit(sample_instance_t *inst, isc_result_t state)
{
run_exclusive_exit(sample_instance_t *inst, isc_result_t state) {
if (state == ISC_R_SUCCESS) {
isc_task_endexclusive(inst->task);
} else {

3
bin/tests/system/dyndb/driver/log.c
View File

@@ -9,8 +9,7 @@
#include <dns/log.h>
void
log_write(int level, const char *format, ...)
{
log_write(int level, const char *format, ...) {
va_list args;
va_start(args, format);

53
bin/tests/system/dyndb/driver/syncptr.c
View File

@@ -30,12 +30,12 @@
typedef struct syncptrevent syncptrevent_t;
struct syncptrevent {
ISC_EVENT_COMMON(syncptrevent_t);
isc_mem_t * mctx;
dns_zone_t * zone;
dns_diff_t diff;
isc_mem_t *mctx;
dns_zone_t *zone;
dns_diff_t diff;
dns_fixedname_t ptr_target_name; /* referenced by owner name in
* tuple */
isc_buffer_t b; /* referenced by target name in tuple */
isc_buffer_t b; /* referenced by target name in tuple */
unsigned char buf[DNS_NAME_MAXWIRE];
};
@@ -47,12 +47,11 @@ struct syncptrevent {
*
*/
static void
syncptr_write(isc_task_t *task, isc_event_t *event)
{
syncptrevent_t * pevent = (syncptrevent_t *)event;
syncptr_write(isc_task_t *task, isc_event_t *event) {
syncptrevent_t *pevent = (syncptrevent_t *)event;
dns_dbversion_t *version = NULL;
dns_db_t * db = NULL;
isc_result_t result;
dns_db_t *db = NULL;
isc_result_t result;
REQUIRE(event->ev_type == SYNCPTR_WRITE_EVENT);
@@ -110,11 +109,10 @@ cleanup:
*/
static isc_result_t
syncptr_find_zone(sample_instance_t *inst, dns_rdata_t *rdata, dns_name_t *name,
dns_zone_t **zone)
{
isc_result_t result;
isc_netaddr_t isc_ip; /* internal net address representation */
dns_rdata_in_a_t ipv4;
dns_zone_t **zone) {
isc_result_t result;
isc_netaddr_t isc_ip; /* internal net address representation */
dns_rdata_in_a_t ipv4;
dns_rdata_in_aaaa_t ipv6;
REQUIRE(inst != NULL);
@@ -197,17 +195,16 @@ cleanup:
*/
static isc_result_t
syncptr(sample_instance_t *inst, dns_name_t *name, dns_rdata_t *addr_rdata,
dns_ttl_t ttl, dns_diffop_t op)
{
isc_result_t result;
isc_mem_t * mctx = inst->mctx;
dns_fixedname_t ptr_name;
dns_zone_t * ptr_zone = NULL;
dns_rdata_ptr_t ptr_struct;
dns_rdata_t ptr_rdata = DNS_RDATA_INIT;
dns_ttl_t ttl, dns_diffop_t op) {
isc_result_t result;
isc_mem_t *mctx = inst->mctx;
dns_fixedname_t ptr_name;
dns_zone_t *ptr_zone = NULL;
dns_rdata_ptr_t ptr_struct;
dns_rdata_t ptr_rdata = DNS_RDATA_INIT;
dns_difftuple_t *tp = NULL;
isc_task_t * task = NULL;
syncptrevent_t * pevent = NULL;
isc_task_t *task = NULL;
syncptrevent_t *pevent = NULL;
dns_fixedname_init(&ptr_name);
DNS_RDATACOMMON_INIT(&ptr_struct, dns_rdatatype_ptr, dns_rdataclass_in);
@@ -291,13 +288,13 @@ cleanup:
*/
isc_result_t
syncptrs(sample_instance_t *inst, dns_name_t *name, dns_rdataset_t *rdataset,
dns_diffop_t op)
{
dns_diffop_t op) {
isc_result_t result;
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdata_t rdata = DNS_RDATA_INIT;
for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS;
result = dns_rdataset_next(rdataset)) {
result = dns_rdataset_next(rdataset))
{
dns_rdataset_current(rdataset, &rdata);
result = syncptr(inst, name, &rdata, rdataset->ttl, op);
if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) {

33
bin/tests/system/dyndb/driver/zone.c
View File

@@ -28,13 +28,12 @@ extern const char *impname;
*/
isc_result_t
create_zone(sample_instance_t *const inst, dns_name_t *const name,
dns_zone_t **const rawp)
{
dns_zone_t **const rawp) {
isc_result_t result;
dns_zone_t * raw = NULL;
const char * zone_argv[1];
char zone_name[DNS_NAME_FORMATSIZE];
dns_acl_t * acl_any = NULL;
dns_zone_t *raw = NULL;
const char *zone_argv[1];
char zone_name[DNS_NAME_FORMATSIZE];
dns_acl_t *acl_any = NULL;
REQUIRE(inst != NULL);
REQUIRE(name != NULL);
@@ -104,12 +103,11 @@ cleanup:
* to clients.
*/
static isc_result_t
publish_zone(sample_instance_t *inst, dns_zone_t *zone)
{
publish_zone(sample_instance_t *inst, dns_zone_t *zone) {
isc_result_t result;
bool freeze = false;
dns_zone_t * zone_in_view = NULL;
dns_view_t * view_in_zone = NULL;
bool freeze = false;
dns_zone_t *zone_in_view = NULL;
dns_view_t *view_in_zone = NULL;
isc_result_t lock_state = ISC_R_IGNORE;
REQUIRE(inst != NULL);
@@ -180,15 +178,15 @@ cleanup:
* on the secure zone!
*/
static isc_result_t
load_zone(dns_zone_t *zone)
{
load_zone(dns_zone_t *zone) {
isc_result_t result;
bool zone_dynamic;
uint32_t serial;
bool zone_dynamic;
uint32_t serial;
result = dns_zone_load(zone, false);
if (result != ISC_R_SUCCESS && result != DNS_R_UPTODATE &&
result != DNS_R_DYNAMIC && result != DNS_R_CONTINUE) {
result != DNS_R_DYNAMIC && result != DNS_R_CONTINUE)
{
goto cleanup;
}
zone_dynamic = (result == DNS_R_DYNAMIC);
@@ -214,8 +212,7 @@ cleanup:
* Add zone to view and call dns_zone_load().
*/
isc_result_t
activate_zone(sample_instance_t *inst, dns_zone_t *raw)
{
activate_zone(sample_instance_t *inst, dns_zone_t *raw) {
isc_result_t result;
/*