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

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

bin/tests/system/dyndb/driver/db.c

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