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

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)
2020-02-12 14:33:32 +00:00
parent dbe15330fe
commit c931d8e417
974 changed files with 75952 additions and 74434 deletions
--- a/bin/tests/system/dyndb/driver/db.c
+++ b/bin/tests/system/dyndb/driver/db.c
@@ -11,6 +11,8 @@
 * Copyright (C) 2009-2015  Red Hat ; see COPYRIGHT for license
 */

+#include "db.h"
+
 #include <inttypes.h>
 #include <stdbool.h>

@@ -26,26 +28,25 @@
 #include <dns/soa.h>
 #include <dns/types.h>

-#include "db.h"
 #include "instance.h"
 #include "syncptr.h"
 #include "util.h"

-#define SAMPLEDB_MAGIC			ISC_MAGIC('S', 'M', 'D', 'B')
+#define SAMPLEDB_MAGIC ISC_MAGIC('S', 'M', 'D', 'B')
 #define VALID_SAMPLEDB(sampledb) \
 	((sampledb) != NULL && (sampledb)->common.impmagic == SAMPLEDB_MAGIC)

 struct sampledb {
-	dns_db_t			common;
-	isc_refcount_t			refs;
-	sample_instance_t		*inst;
+	dns_db_t	   common;
+	isc_refcount_t	   refs;
+	sample_instance_t *inst;

 	/*
 	 * Internal RBT database implementation provided by BIND.
 	 * Most dns_db_* calls (find(), createiterator(), etc.)
 	 * are blindly forwarded to this RBT DB.
 	 */
-	dns_db_t			*rbtdb;
+	dns_db_t *rbtdb;
 };

 typedef struct sampledb sampledb_t;
@@ -60,13 +61,15 @@ 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) {
-	dns_rbtnode_t *rbtnode = (dns_rbtnode_t *) node;
+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));
@@ -76,16 +79,19 @@ 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);
 	dns_name_free(&sampledb->common.origin, sampledb->common.mctx);
-	isc_mem_putanddetach(&sampledb->common.mctx, sampledb, sizeof(*sampledb));
+	isc_mem_putanddetach(&sampledb->common.mctx, sampledb,
+			     sizeof(*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;
@@ -101,7 +107,8 @@ 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);

@@ -117,7 +124,8 @@ 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);

@@ -128,8 +136,9 @@ endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) {
 }

 static isc_result_t
-serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -140,7 +149,6 @@ static isc_result_t
 dump(dns_db_t *db, dns_dbversion_t *version, const char *filename,
     dns_masterformat_t masterformat)
 {
-
 	UNUSED(db);
 	UNUSED(version);
 	UNUSED(filename);
@@ -153,7 +161,8 @@ 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));
@@ -162,7 +171,8 @@ 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));
@@ -171,8 +181,7 @@ 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;

@@ -182,7 +191,8 @@ attachversion(dns_db_t *db, dns_dbversion_t *source,
 }

 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));
@@ -194,7 +204,7 @@ static isc_result_t
 findnode(dns_db_t *db, const dns_name_t *name, bool create,
 	 dns_dbnode_t **nodep)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -207,13 +217,12 @@ find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
     dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset,
     dns_rdataset_t *sigrdataset)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

-	return (dns_db_find(sampledb->rbtdb, name, version, type,
-			    options, now, nodep, foundname,
-			    rdataset, sigrdataset));
+	return (dns_db_find(sampledb->rbtdb, name, version, type, options, now,
+			    nodep, foundname, rdataset, sigrdataset));
 }

 static isc_result_t
@@ -222,28 +231,28 @@ findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options,
 	    dns_name_t *dcname, dns_rdataset_t *rdataset,
 	    dns_rdataset_t *sigrdataset)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

-	return (dns_db_findzonecut(sampledb->rbtdb, name, options,
-				   now, nodep, foundname, dcname, rdataset,
-				   sigrdataset));
+	return (dns_db_findzonecut(sampledb->rbtdb, name, options, now, nodep,
+				   foundname, dcname, rdataset, sigrdataset));
 }

 static void
-attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

 	dns_db_attachnode(sampledb->rbtdb, source, targetp);
-
 }

 static void
-detachnode(dns_db_t *db, dns_dbnode_t **targetp) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+detachnode(dns_db_t *db, dns_dbnode_t **targetp)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -251,8 +260,9 @@ 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) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -260,8 +270,9 @@ 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) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -269,10 +280,9 @@ 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;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -284,7 +294,7 @@ 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)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -296,12 +306,12 @@ 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)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

-	return (dns_db_allrdatasets(sampledb->rbtdb, node, version,
-				    now, iteratorp));
+	return (dns_db_allrdatasets(sampledb->rbtdb, node, version, now,
+				    iteratorp));
 }

 static isc_result_t
@@ -309,15 +319,15 @@ 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;
+	sampledb_t *	sampledb = (sampledb_t *)db;
+	isc_result_t	result;
 	dns_fixedname_t name;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

 	dns_fixedname_init(&name);
-	CHECK(dns_db_addrdataset(sampledb->rbtdb, node, version, now,
-				 rdataset, options, addedrdataset));
+	CHECK(dns_db_addrdataset(sampledb->rbtdb, node, version, now, rdataset,
+				 options, addedrdataset));
 	if (rdataset->type == dns_rdatatype_a ||
 	    rdataset->type == dns_rdatatype_aaaa) {
 		CHECK(sample_name_fromnode(node, dns_fixedname_name(&name)));
@@ -334,8 +344,8 @@ 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;
+	sampledb_t *	sampledb = (sampledb_t *)db;
+	isc_result_t	result;
 	dns_fixedname_t name;

 	REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -365,17 +375,18 @@ 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)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

-	return (dns_db_deleterdataset(sampledb->rbtdb, node, version,
-				      type, covers));
+	return (dns_db_deleterdataset(sampledb->rbtdb, node, version, type,
+				      covers));
 }

 static bool
-issecure(dns_db_t *db) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+issecure(dns_db_t *db)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -383,8 +394,9 @@ issecure(dns_db_t *db) {
 }

 static unsigned int
-nodecount(dns_db_t *db) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+nodecount(dns_db_t *db)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -396,15 +408,17 @@ 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) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+overmem(dns_db_t *db, bool over)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -412,8 +426,9 @@ overmem(dns_db_t *db, bool over) {
 }

 static void
-settask(dns_db_t *db, isc_task_t *task) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+settask(dns_db_t *db, isc_task_t *task)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -421,8 +436,9 @@ settask(dns_db_t *db, isc_task_t *task) {
 }

 static isc_result_t
-getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+getoriginnode(dns_db_t *db, dns_dbnode_t **nodep)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -430,36 +446,33 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) {
 }

 static void
-transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

 	dns_db_transfernode(sampledb->rbtdb, sourcep, 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)
+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)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

-	return (dns_db_getnsec3parameters(sampledb->rbtdb, version,
-					  hash, flags, iterations,
-					  salt, salt_length));
-
+	return (dns_db_getnsec3parameters(sampledb->rbtdb, version, hash, flags,
+					  iterations, salt, salt_length));
 }

 static isc_result_t
 findnsec3node(dns_db_t *db, const dns_name_t *name, bool create,
 	      dns_dbnode_t **nodep)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -467,8 +480,9 @@ 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) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -476,8 +490,9 @@ 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) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -485,8 +500,9 @@ 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) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -494,8 +510,9 @@ resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) {
 }

 static bool
-isdnssec(dns_db_t *db) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+isdnssec(dns_db_t *db)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -503,26 +520,26 @@ isdnssec(dns_db_t *db) {
 }

 static dns_stats_t *
-getrrsetstats(dns_db_t *db) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+getrrsetstats(dns_db_t *db)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

 	return (dns_db_getrrsetstats(sampledb->rbtdb));
-
 }

 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)
+findnodeext(dns_db_t *db, const dns_name_t *name, bool create,
+	    dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo,
+	    dns_dbnode_t **nodep)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

-	return (dns_db_findnodeext(sampledb->rbtdb, name, create,
-				   methods, clientinfo, nodep));
+	return (dns_db_findnodeext(sampledb->rbtdb, name, create, methods,
+				   clientinfo, nodep));
 }

 static isc_result_t
@@ -532,18 +549,19 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
 	dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo,
 	dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset)
 {
-	sampledb_t *sampledb = (sampledb_t *) db;
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

-	return (dns_db_findext(sampledb->rbtdb, name, version, type,
-			       options, now, nodep, foundname, methods,
-			       clientinfo, rdataset, sigrdataset));
+	return (dns_db_findext(sampledb->rbtdb, name, version, type, options,
+			       now, nodep, foundname, methods, clientinfo,
+			       rdataset, sigrdataset));
 }

 static isc_result_t
-setcachestats(dns_db_t *db, isc_stats_t *stats) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+setcachestats(dns_db_t *db, isc_stats_t *stats)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -551,8 +569,9 @@ setcachestats(dns_db_t *db, isc_stats_t *stats) {
 }

 static size_t
-hashsize(dns_db_t *db) {
-	sampledb_t *sampledb = (sampledb_t *) db;
+hashsize(dns_db_t *db)
+{
+	sampledb_t *sampledb = (sampledb_t *)db;

 	REQUIRE(VALID_SAMPLEDB(sampledb));

@@ -601,17 +620,17 @@ static dns_dbmethods_t sampledb_methods = {
 	resigned,
 	isdnssec,
 	getrrsetstats,
-	NULL,			/* rpz_attach */
-	NULL,			/* rpz_ready */
+	NULL, /* rpz_attach */
+	NULL, /* rpz_ready */
 	findnodeext,
 	findext,
 	setcachestats,
 	hashsize,
-	NULL,			/* nodefullname */
-	NULL,			/* getsize */
-	NULL,			/* setservestalettl */
-	NULL,			/* getservestalettl */
-	NULL			/* setgluecachestats */
+	NULL, /* nodefullname */
+	NULL, /* getsize */
+	NULL, /* setservestalettl */
+	NULL, /* getservestalettl */
+	NULL  /* setgluecachestats */
 };

 /* Auxiliary driver functions. */
@@ -629,17 +648,17 @@ 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;
+	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);
-	CHECK(dns_soa_buildrdata(origin, contact, dns_db_class(db),
-				 0, 28800, 7200, 604800, 86400, buf, &rdata));
+	CHECK(dns_soa_buildrdata(origin, contact, dns_db_class(db), 0, 28800,
+				 7200, 604800, 86400, buf, &rdata));
 	rdatalist.type = rdata.type;
 	rdatalist.covers = 0;
 	rdatalist.rdclass = rdata.rdclass;
@@ -648,25 +667,24 @@ add_soa(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
 	CHECK(dns_rdatalist_tordataset(&rdatalist, &rdataset));
 	CHECK(dns_db_findnode(db, name, true, &node));
 	CHECK(dns_db_addrdataset(db, node, version, 0, &rdataset, 0, NULL));
- cleanup:
+cleanup:
 	if (node != NULL)
 		dns_db_detachnode(db, &node);
 	return (result);
 }

-
 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;
+	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));

@@ -687,7 +705,7 @@ add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
 	CHECK(dns_rdatalist_tordataset(&rdatalist, &rdataset));
 	CHECK(dns_db_findnode(db, name, true, &node));
 	CHECK(dns_db_addrdataset(db, node, version, 0, &rdataset, 0, NULL));
- cleanup:
+cleanup:
 	if (node != NULL)
 		dns_db_detachnode(db, &node);
 	return (result);
@@ -697,14 +715,14 @@ 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;
+	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));

@@ -723,7 +741,7 @@ add_a(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
 	CHECK(dns_rdatalist_tordataset(&rdatalist, &rdataset));
 	CHECK(dns_db_findnode(db, name, true, &node));
 	CHECK(dns_db_addrdataset(db, node, version, 0, &rdataset, 0, NULL));
- cleanup:
+cleanup:
 	if (node != NULL)
 		dns_db_detachnode(db, &node);
 	return (result);
@@ -740,10 +758,10 @@ 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;
+	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);