Reformat sources with up-to-date clang-format-17

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 1643b6716e6791be21df4b1d0ec597f63540cf93..b3657be2e880d3c46ba9675ceb56a76e5d6f840d 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -78,15 +78,15 @@ extern unsigned int dns_pps;
 *****/
 
 typedef struct dns_dbmethods {
-       void         (*destroy)(dns_db_t *db);
+       void (*destroy)(dns_db_t *db);
        isc_result_t (*beginload)(dns_db_t             *db,
                                  dns_rdatacallbacks_t *callbacks);
        isc_result_t (*endload)(dns_db_t *db, dns_rdatacallbacks_t *callbacks);
        void (*currentversion)(dns_db_t *db, dns_dbversion_t **versionp);
        isc_result_t (*newversion)(dns_db_t *db, dns_dbversion_t **versionp);
-       void         (*attachversion)(dns_db_t *db, dns_dbversion_t *source,
+       void (*attachversion)(dns_db_t *db, dns_dbversion_t *source,
                              dns_dbversion_t **targetp);
-       void         (*closeversion)(dns_db_t *db, dns_dbversion_t **versionp,
+       void (*closeversion)(dns_db_t *db, dns_dbversion_t **versionp,
                             bool commit DNS__DB_FLARG);
        isc_result_t (*findnode)(dns_db_t *db, const dns_name_t *name,
                                 bool                 create,
@@ -103,7 +103,7 @@ typedef struct dns_dbmethods {
                                    dns_name_t                 *dcname,
                                    dns_rdataset_t             *rdataset,
                                    dns_rdataset_t *sigrdataset DNS__DB_FLARG);
-       void         (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
+       void (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
                           dns_dbnode_t **targetp DNS__DB_FLARG);
        void (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp DNS__DB_FLARG);
        isc_result_t (*createiterator)(dns_db_t *db, unsigned int options,
@@ -131,9 +131,9 @@ typedef struct dns_dbmethods {
                                       dns_dbversion_t       *version,
                                       dns_rdatatype_t        type,
                                       dns_rdatatype_t covers DNS__DB_FLARG);
-       bool         (*issecure)(dns_db_t *db);
+       bool (*issecure)(dns_db_t *db);
        unsigned int (*nodecount)(dns_db_t *db, dns_dbtree_t);
-       void         (*setloop)(dns_db_t *db, isc_loop_t *);
+       void (*setloop)(dns_db_t *db, isc_loop_t *);
        isc_result_t (*getoriginnode)(dns_db_t            *db,
                                      dns_dbnode_t **nodep DNS__DB_FLARG);
        isc_result_t (*getnsec3parameters)(dns_db_t        *db,
@@ -164,7 +164,7 @@ typedef struct dns_dbmethods {
                                dns_rdataset_t             *rdataset,
                                dns_rdataset_t *sigrdataset DNS__DB_FLARG);
        isc_result_t (*setcachestats)(dns_db_t *db, isc_stats_t *stats);
-       size_t       (*hashsize)(dns_db_t *db);
+       size_t (*hashsize)(dns_db_t *db);
        isc_result_t (*getsize)(dns_db_t *db, dns_dbversion_t *version,
                                uint64_t *records, uint64_t *bytes);
        isc_result_t (*setservestalettl)(dns_db_t *db, dns_ttl_t ttl);

diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index d9b31ad4e3e1526ab5270730300c818d2da5502c..e03636a7e70800e3a48244a6b4fc407f07b54c9d 100644 (file)
--- a/lib/dns/include/dns/dbiterator.h
+++ b/lib/dns/include/dns/dbiterator.h
@@ -68,7 +68,7 @@ ISC_LANG_BEGINDECLS
 *****/
 
 typedef struct dns_dbiteratormethods {
-       void         (*destroy)(dns_dbiterator_t **iteratorp DNS__DB_FLARG);
+       void (*destroy)(dns_dbiterator_t **iteratorp DNS__DB_FLARG);
        isc_result_t (*first)(dns_dbiterator_t *iterator DNS__DB_FLARG);
        isc_result_t (*last)(dns_dbiterator_t *iterator DNS__DB_FLARG);
        isc_result_t (*seek)(dns_dbiterator_t      *iterator,

diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index 1712abe9a9484b02d483cd39e4adeee3171c88b2..b407cf2552ad7fafb983700231735120472733e6 100644 (file)
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -287,9 +287,9 @@ dns_keynode_trust(dns_keynode_t *keynode);
 
 void
 dns_keytable_forall(dns_keytable_t *keytable,
-                   void            (*func)(dns_keytable_t *, dns_keynode_t *,
-                                   dns_name_t *, void *),
-                   void           *arg);
+                   void (*func)(dns_keytable_t *, dns_keynode_t *,
+                                dns_name_t *, void *),
+                   void *arg);
 /*%<
  * Call 'func' on each keynode in 'keytable'.
  */

diff --git a/lib/dns/include/dns/qp.h b/lib/dns/include/dns/qp.h
index 2c6ab53c6b9e783c08b2e90b832c1b5272e4e572..cb92d4f78d34170786aec672f7ff854b9c4910b2 100644 (file)
--- a/lib/dns/include/dns/qp.h
+++ b/lib/dns/include/dns/qp.h
@@ -282,11 +282,11 @@ typedef struct dns_qpchain {
  * readable identifier into `buf` which has max length `size`.
  */
 typedef struct dns_qpmethods {
-       void   (*attach)(void *uctx, void *pval, uint32_t ival);
-       void   (*detach)(void *uctx, void *pval, uint32_t ival);
+       void (*attach)(void *uctx, void *pval, uint32_t ival);
+       void (*detach)(void *uctx, void *pval, uint32_t ival);
        size_t (*makekey)(dns_qpkey_t key, void *uctx, void *pval,
                          uint32_t ival);
-       void   (*triename)(void *uctx, char *buf, size_t size);
+       void (*triename)(void *uctx, char *buf, size_t size);
 } dns_qpmethods_t;
 
 /*%

diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 88d87ebb5d946c9227dad07109130807cc8fa313..08b4803ab99aaef7a3adeca2d30e7f5d241c66ae 100644 (file)
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -698,7 +698,7 @@ dns_rbt_destroy2(dns_rbt_t **rbtp, unsigned int quantum);
 
 void
 dns_rbt_printtext(dns_rbt_t *rbt, void (*data_printer)(FILE *, void *),
-                 FILE *f);
+                 FILE      *f);
 /*%<
  * Print an ASCII representation of the internal structure of the red-black
  * tree of trees to the passed stream.

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index df804f05468ae914bcfa0dee4f02c4039a52413a..82161641006b33d1152351d962a295f810bcb039 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -75,11 +75,11 @@ typedef enum {
 } dns_rdatasetadditional_t;
 
 typedef struct dns_rdatasetmethods {
-       void         (*disassociate)(dns_rdataset_t *rdataset DNS__DB_FLARG);
+       void (*disassociate)(dns_rdataset_t *rdataset DNS__DB_FLARG);
        isc_result_t (*first)(dns_rdataset_t *rdataset);
        isc_result_t (*next)(dns_rdataset_t *rdataset);
-       void         (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
-       void         (*clone)(dns_rdataset_t        *source,
+       void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
+       void (*clone)(dns_rdataset_t        *source,
                      dns_rdataset_t *target DNS__DB_FLARG);
        unsigned int (*count)(dns_rdataset_t *rdataset);
        isc_result_t (*addnoqname)(dns_rdataset_t   *rdataset,
@@ -92,9 +92,9 @@ typedef struct dns_rdatasetmethods {
        isc_result_t (*getclosest)(dns_rdataset_t *rdataset, dns_name_t *name,
                                   dns_rdataset_t        *neg,
                                   dns_rdataset_t *negsig DNS__DB_FLARG);
-       void         (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
-       void         (*expire)(dns_rdataset_t *rdataset DNS__DB_FLARG);
-       void         (*clearprefetch)(dns_rdataset_t *rdataset);
+       void (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
+       void (*expire)(dns_rdataset_t *rdataset DNS__DB_FLARG);
+       void (*clearprefetch)(dns_rdataset_t *rdataset);
        void (*setownercase)(dns_rdataset_t *rdataset, const dns_name_t *name);
        void (*getownercase)(const dns_rdataset_t *rdataset, dns_name_t *name);
        isc_result_t (*addglue)(dns_rdataset_t  *rdataset,

diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h
index 4976babcd0112e078eee8fcc810ac07f7cc90273..4689d333c3cf69ea7eb2ee3ab609b4b5e4732312 100644 (file)
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -67,10 +67,10 @@ ISC_LANG_BEGINDECLS
 *****/
 
 typedef struct dns_rdatasetitermethods {
-       void         (*destroy)(dns_rdatasetiter_t **iteratorp DNS__DB_FLARG);
+       void (*destroy)(dns_rdatasetiter_t **iteratorp DNS__DB_FLARG);
        isc_result_t (*first)(dns_rdatasetiter_t *iterator DNS__DB_FLARG);
        isc_result_t (*next)(dns_rdatasetiter_t *iterator DNS__DB_FLARG);
-       void         (*current)(dns_rdatasetiter_t      *iterator,
+       void (*current)(dns_rdatasetiter_t      *iterator,
                        dns_rdataset_t *rdataset DNS__DB_FLARG);
 } dns_rdatasetitermethods_t;
 

diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h
index 95dea85b5c575969d9a517319e5acf2e86e08ad2..8ca1bf090e097efe633fcd6dc14e01a8d2e8a16c 100644 (file)
--- a/lib/dns/include/dns/update.h
+++ b/lib/dns/include/dns/update.h
@@ -27,8 +27,8 @@
 #include <dns/types.h>
 
 typedef struct {
-       void  (*func)(void *arg, dns_zone_t *zone, int level,
-                     const char *message);
+       void (*func)(void *arg, dns_zone_t *zone, int level,
+                    const char *message);
        void *arg;
 } dns_update_log_t;
 

diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index ea0addf0bd2d4dc4bd573767df49c39ade45a21b..ab7098af7c395aa3cd0c4bf004d5abd10f549e1f 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -212,13 +212,13 @@ struct dns_view {
         * XXX: This should be a pointer to an opaque type that
         * named implements.
         */
-       char       *new_zone_dir;
-       char       *new_zone_file;
-       char       *new_zone_db;
-       void       *new_zone_dbenv;
-       uint64_t    new_zone_mapsize;
-       void       *new_zone_config;
-       void        (*cfg_destroy)(void **);
+       char    *new_zone_dir;
+       char    *new_zone_file;
+       char    *new_zone_db;
+       void    *new_zone_dbenv;
+       uint64_t new_zone_mapsize;
+       void    *new_zone_config;
+       void (*cfg_destroy)(void **);
        isc_mutex_t new_zone_lock;
 
        unsigned char secret[32]; /* Client secret */
@@ -230,11 +230,11 @@ struct dns_view {
 
        /* Registered module instances */
        void *plugins;
-       void  (*plugins_free)(isc_mem_t *, void **);
+       void (*plugins_free)(isc_mem_t *, void **);
 
        /* Hook table */
        void *hooktable; /* ns_hooktable */
-       void  (*hooktable_free)(isc_mem_t *, void **);
+       void (*hooktable_free)(isc_mem_t *, void **);
 };
 
 #define DNS_VIEW_MAGIC      ISC_MAGIC('V', 'i', 'e', 'w')

diff --git a/lib/isc/include/isc/job.h b/lib/isc/include/isc/job.h
index 56a95e3d849c728fa344629c0b90b4e56d211bef..9a44974c251b38f14a67f599a68c67986a3e3b71 100644 (file)
--- a/lib/isc/include/isc/job.h
+++ b/lib/isc/include/isc/job.h
@@ -30,7 +30,7 @@
 #include <isc/types.h>
 #include <isc/urcu.h>
 
-typedef void          (*isc_job_cb)(void *);
+typedef void (*isc_job_cb)(void *);
 typedef struct isc_job isc_job_t;
 
 struct isc_job {

diff --git a/lib/isc/include/isc/thread.h b/lib/isc/include/isc/thread.h
index b9bbaabdc3310db5b3adcd1bec2f9c0f9fb342aa..a24dfcdca5f59e612cc8bcdc53667013ae9f3145 100644 (file)
--- a/lib/isc/include/isc/thread.h
+++ b/lib/isc/include/isc/thread.h
@@ -33,7 +33,7 @@
 ISC_LANG_BEGINDECLS
 
 typedef pthread_t isc_thread_t;
-typedef void    *(*isc_threadfunc_t)(void *);
+typedef void *(*isc_threadfunc_t)(void *);
 
 /*%
  * like isc_thread_create(), but run the function on the current

diff --git a/lib/isc/include/isc/work.h b/lib/isc/include/isc/work.h
index e456e9059792a84d5eb088a8ffbf3653c32b8e65..df196e95ea078ec8568cead1515eec227f2e45b3 100644 (file)
--- a/lib/isc/include/isc/work.h
+++ b/lib/isc/include/isc/work.h
@@ -18,8 +18,8 @@
 #include <isc/lang.h>
 #include <isc/loop.h>
 
-typedef void           (*isc_work_cb)(void *arg);
-typedef void           (*isc_after_work_cb)(void *arg);
+typedef void (*isc_work_cb)(void *arg);
+typedef void (*isc_after_work_cb)(void *arg);
 typedef struct isc_work isc_work_t;
 
 ISC_LANG_BEGINDECLS

diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 2f9c81b907e22383426091c1221582069bfb31e9..f790cd4377f2865f3f069c1edccf4bd8e39a3e76 100644 (file)
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -501,11 +501,11 @@ cfg_listelt_value(const cfg_listelt_t *elt);
 
 void
 cfg_print(const cfg_obj_t *obj,
-         void             (*f)(void *closure, const char *text, int textlen),
-         void            *closure);
+         void (*f)(void *closure, const char *text, int textlen),
+         void *closure);
 void
 cfg_printx(const cfg_obj_t *obj, unsigned int flags,
-          void  (*f)(void *closure, const char *text, int textlen),
+          void (*f)(void *closure, const char *text, int textlen),
           void *closure);
 
 #define CFG_PRINTER_XKEY    0x1 /* '?' out shared keys. */
@@ -527,7 +527,7 @@ cfg_printx(const cfg_obj_t *obj, unsigned int flags,
 
 void
 cfg_print_grammar(const cfg_type_t *type, unsigned int flags,
-                 void  (*f)(void *closure, const char *text, int textlen),
+                 void (*f)(void *closure, const char *text, int textlen),
                  void *closure);
 /*%<
  * Print a summary of the grammar of the configuration type 'type'.

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index b93d38d139dc9982db32b50e586a2bd7c3b24b47..7cbcf7f47068bde93f6a84199f0365d9e20703f3 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -87,9 +87,9 @@ typedef struct cfg_rep cfg_rep_t;
 
 typedef isc_result_t (*cfg_parsefunc_t)(cfg_parser_t *, const cfg_type_t *type,
                                        cfg_obj_t **);
-typedef void        (*cfg_printfunc_t)(cfg_printer_t *, const cfg_obj_t *);
-typedef void        (*cfg_docfunc_t)(cfg_printer_t *, const cfg_type_t *);
-typedef void        (*cfg_freefunc_t)(cfg_parser_t *, cfg_obj_t *);
+typedef void (*cfg_printfunc_t)(cfg_printer_t *, const cfg_obj_t *);
+typedef void (*cfg_docfunc_t)(cfg_printer_t *, const cfg_type_t *);
+typedef void (*cfg_freefunc_t)(cfg_parser_t *, cfg_obj_t *);
 
 /*
  * Structure definitions
@@ -101,7 +101,7 @@ typedef void             (*cfg_freefunc_t)(cfg_parser_t *, cfg_obj_t *);
  * by calling the function 'f'.
  */
 struct cfg_printer {
-       void  (*f)(void *closure, const char *text, int textlen);
+       void (*f)(void *closure, const char *text, int textlen);
        void *closure;
        int   indent;
        int   flags;
@@ -574,7 +574,7 @@ cfg_clause_validforzone(const char *name, unsigned int ztype);
 
 void
 cfg_print_zonegrammar(const unsigned int zonetype, unsigned int flags,
-                     void  (*f)(void *closure, const char *text, int textlen),
+                     void (*f)(void *closure, const char *text, int textlen),
                      void *closure);
 /*%<
  * Print a summary of the grammar of the zone type represented by

diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h
index 4df84d332e849c33973f69d28071a18c878c7adb..db938bc4f5656803aebc9756968d9e8c8acdd3a5 100644 (file)
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -184,13 +184,13 @@ struct ns_client {
        uint16_t        extflags;
        int16_t         ednsversion; /* -1 noedns */
        uint16_t        additionaldepth;
-       void            (*cleanup)(ns_client_t *);
-       ns_query_t      query;
-       isc_time_t      requesttime;
-       isc_stdtime_t   now;
-       isc_time_t      tnow;
-       dns_name_t      signername; /*%< [T]SIG key name */
-       dns_name_t     *signer;     /*%< NULL if not valid sig */
+       void (*cleanup)(ns_client_t *);
+       ns_query_t    query;
+       isc_time_t    requesttime;
+       isc_stdtime_t now;
+       isc_time_t    tnow;
+       dns_name_t    signername; /*%< [T]SIG key name */
+       dns_name_t   *signer;     /*%< NULL if not valid sig */
 
        isc_sockaddr_t peeraddr;
        bool           peeraddr_valid;