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 fa17dc9f22cce9854337f01f9bcb5483367fdaa9..84b1cb10a08f6bd2a1b1a907752927a0ec3d94aa 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -71,8 +71,8 @@ ISC_LANG_BEGINDECLS
 *****/
 
 typedef struct dns_dbmethods {
-       void         (*attach)(dns_db_t *source, dns_db_t **targetp);
-       void         (*detach)(dns_db_t **dbp);
+       void (*attach)(dns_db_t *source, dns_db_t **targetp);
+       void (*detach)(dns_db_t **dbp);
        isc_result_t (*beginload)(dns_db_t             *db,
                                  dns_rdatacallbacks_t *callbacks);
        isc_result_t (*endload)(dns_db_t *db, dns_rdatacallbacks_t *callbacks);
@@ -83,9 +83,9 @@ typedef struct dns_dbmethods {
                             dns_masterformat_t masterformat);
        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);
        isc_result_t (*findnode)(dns_db_t *db, const dns_name_t *name,
                                 bool create, dns_dbnode_t **nodep);
@@ -101,12 +101,12 @@ typedef struct dns_dbmethods {
                                    dns_name_t     *dcname,
                                    dns_rdataset_t *rdataset,
                                    dns_rdataset_t *sigrdataset);
-       void         (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
+       void (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
                           dns_dbnode_t **targetp);
-       void         (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp);
+       void (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp);
        isc_result_t (*expirenode)(dns_db_t *db, dns_dbnode_t *node,
                                   isc_stdtime_t now);
-       void         (*printnode)(dns_db_t *db, dns_dbnode_t *node, FILE *out);
+       void (*printnode)(dns_db_t *db, dns_dbnode_t *node, FILE *out);
        isc_result_t (*createiterator)(dns_db_t *db, unsigned int options,
                                       dns_dbiterator_t **iteratorp);
        isc_result_t (*findrdataset)(dns_db_t *db, dns_dbnode_t *node,
@@ -133,13 +133,13 @@ typedef struct dns_dbmethods {
                                       dns_dbversion_t *version,
                                       dns_rdatatype_t  type,
                                       dns_rdatatype_t  covers);
-       bool         (*issecure)(dns_db_t *db);
+       bool (*issecure)(dns_db_t *db);
        unsigned int (*nodecount)(dns_db_t *db);
-       bool         (*ispersistent)(dns_db_t *db);
-       void         (*overmem)(dns_db_t *db, bool overmem);
-       void         (*settask)(dns_db_t *db, isc_task_t *);
+       bool (*ispersistent)(dns_db_t *db);
+       void (*overmem)(dns_db_t *db, bool overmem);
+       void (*settask)(dns_db_t *db, isc_task_t *);
        isc_result_t (*getoriginnode)(dns_db_t *db, dns_dbnode_t **nodep);
-       void         (*transfernode)(dns_db_t *db, dns_dbnode_t **sourcep,
+       void (*transfernode)(dns_db_t *db, dns_dbnode_t **sourcep,
                             dns_dbnode_t **targetp);
        isc_result_t (*getnsec3parameters)(dns_db_t        *db,
                                           dns_dbversion_t *version,
@@ -153,11 +153,11 @@ typedef struct dns_dbmethods {
                                       isc_stdtime_t resign);
        isc_result_t (*getsigningtime)(dns_db_t *db, dns_rdataset_t *rdataset,
                                       dns_name_t *name);
-       void         (*resigned)(dns_db_t *db, dns_rdataset_t *rdataset,
+       void (*resigned)(dns_db_t *db, dns_rdataset_t *rdataset,
                         dns_dbversion_t *version);
-       bool         (*isdnssec)(dns_db_t *db);
+       bool (*isdnssec)(dns_db_t *db);
        dns_stats_t *(*getrrsetstats)(dns_db_t *db);
-       void         (*rpz_attach)(dns_db_t *db, void *rpzs, uint8_t rpz_num);
+       void (*rpz_attach)(dns_db_t *db, void *rpzs, uint8_t rpz_num);
        isc_result_t (*rpz_ready)(dns_db_t *db);
        isc_result_t (*findnodeext)(dns_db_t *db, const dns_name_t *name,
                                    bool                     create,
@@ -173,7 +173,7 @@ typedef struct dns_dbmethods {
                                dns_rdataset_t          *rdataset,
                                dns_rdataset_t          *sigrdataset);
        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 (*nodefullname)(dns_db_t *db, dns_dbnode_t *node,
                                     dns_name_t *name);
        isc_result_t (*getsize)(dns_db_t *db, dns_dbversion_t *version,

diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index d550b6f74ed515699ad397121797bb4a8ec9ea8a..32f204a8b3a453871890ec8ad0287cf5fcd86d37 100644 (file)
--- a/lib/dns/include/dns/dbiterator.h
+++ b/lib/dns/include/dns/dbiterator.h
@@ -69,7 +69,7 @@ ISC_LANG_BEGINDECLS
 *****/
 
 typedef struct dns_dbiteratormethods {
-       void         (*destroy)(dns_dbiterator_t **iteratorp);
+       void (*destroy)(dns_dbiterator_t **iteratorp);
        isc_result_t (*first)(dns_dbiterator_t *iterator);
        isc_result_t (*last)(dns_dbiterator_t *iterator);
        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 49c53436ed0f3608b873e8e9e8c7ff1dc2925ec3..9557ab82b309d78debb88d3978984ef8f5ea059e 100644 (file)
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -342,9 +342,9 @@ dns_keynode_trust(dns_keynode_t *keynode);
 
 isc_result_t
 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);
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_KEYTABLE_H */

diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 0e904e21531e1caead95a1ad62016416fe06150e..4a6b0781c78d9bdcb1637be0e7d611a0e025d8ae 100644 (file)
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -762,7 +762,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize,
 
 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 f5679573b3c5cd2cb54ed90b552590e65fd1bb16..de3f638f895fc777d24f63e81b97676df4b178eb 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -64,11 +64,11 @@ typedef enum {
 } dns_rdatasetadditional_t;
 
 typedef struct dns_rdatasetmethods {
-       void         (*disassociate)(dns_rdataset_t *rdataset);
+       void (*disassociate)(dns_rdataset_t *rdataset);
        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, dns_rdataset_t *target);
+       void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
+       void (*clone)(dns_rdataset_t *source, dns_rdataset_t *target);
        unsigned int (*count)(dns_rdataset_t *rdataset);
        isc_result_t (*addnoqname)(dns_rdataset_t   *rdataset,
                                   const dns_name_t *name);
@@ -78,9 +78,9 @@ typedef struct dns_rdatasetmethods {
                                   const dns_name_t *name);
        isc_result_t (*getclosest)(dns_rdataset_t *rdataset, dns_name_t *name,
                                   dns_rdataset_t *neg, dns_rdataset_t *negsig);
-       void         (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
-       void         (*expire)(dns_rdataset_t *rdataset);
-       void         (*clearprefetch)(dns_rdataset_t *rdataset);
+       void (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
+       void (*expire)(dns_rdataset_t *rdataset);
+       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 d21b060d0b6f21d16e83645eba2ded746b3903a8..2df4aad97fd83b97f876937d7f140de82921f731 100644 (file)
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -68,7 +68,7 @@ ISC_LANG_BEGINDECLS
 *****/
 
 typedef struct dns_rdatasetitermethods {
-       void         (*destroy)(dns_rdatasetiter_t **iteratorp);
+       void (*destroy)(dns_rdatasetiter_t **iteratorp);
        isc_result_t (*first)(dns_rdatasetiter_t *iterator);
        isc_result_t (*next)(dns_rdatasetiter_t *iterator);
        void (*current)(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset);

diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h
index 06d97a0dd65394aace32300a76a19309ddc74d60..aca9e716d3f682e47031ff49f55bc7e84b0f1f42 100644 (file)
--- a/lib/dns/include/dns/update.h
+++ b/lib/dns/include/dns/update.h
@@ -28,8 +28,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 cd20e559af1bcaf64d25b27c684a8bb24c693391..d6e7f10e1893395001e93c3494c16257b89465f6 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -220,13 +220,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 */
@@ -238,11 +238,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/mem.h b/lib/isc/include/isc/mem.h
index 91a770e40129be52746890a4d7adcc9eb4a7b64f..1542edd76e5d080d98cc719af4308bd4fe4d7b7c 100644 (file)
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -184,16 +184,16 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
 /*% memory and memory pool methods */
 typedef struct isc_memmethods {
        void *(*memget)(isc_mem_t *mctx, size_t size _ISC_MEM_FLARG);
-       void  (*memput)(isc_mem_t *mctx, void *ptr, size_t size _ISC_MEM_FLARG);
-       void  (*memputanddetach)(isc_mem_t **mctxp, void *ptr,
-                                size_t size _ISC_MEM_FLARG);
+       void (*memput)(isc_mem_t *mctx, void *ptr, size_t size _ISC_MEM_FLARG);
+       void (*memputanddetach)(isc_mem_t **mctxp, void *ptr,
+                               size_t size _ISC_MEM_FLARG);
        void *(*memallocate)(isc_mem_t *mctx, size_t size _ISC_MEM_FLARG);
        void *(*memreallocate)(isc_mem_t *mctx, void *ptr,
                               size_t size _ISC_MEM_FLARG);
        char *(*memstrdup)(isc_mem_t *mctx, const char *s _ISC_MEM_FLARG);
        char *(*memstrndup)(isc_mem_t *mctx, const char *s,
                            size_t size _ISC_MEM_FLARG);
-       void  (*memfree)(isc_mem_t *mctx, void *ptr _ISC_MEM_FLARG);
+       void (*memfree)(isc_mem_t *mctx, void *ptr _ISC_MEM_FLARG);
 } isc_memmethods_t;
 
 /*%

diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 52040014db1511639b1e4570748a898b3500ceeb..60e711422cf6090363a49a3765c3af961ac882fe 100644 (file)
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -98,7 +98,7 @@ typedef struct isc_timer      isc_timer_t;    /*%< Timer */
 typedef struct isc_timermgr   isc_timermgr_t;  /*%< Timer Manager */
 
 typedef void (*isc_taskaction_t)(isc_task_t *, isc_event_t *);
-typedef int  (*isc_sockfdwatch_t)(isc_task_t *, isc_socket_t *, void *, int);
+typedef int (*isc_sockfdwatch_t)(isc_task_t *, isc_socket_t *, void *, int);
 
 /* The following cannot be listed alphabetically due to forward reference */
 typedef isc_result_t(isc_httpdaction_t)(

diff --git a/lib/isc/include/pk11/pk11.h b/lib/isc/include/pk11/pk11.h
index d02a9ff3abbea14d458700fd5b1342c69e7b0ca9..076c11986c032a4729c21ae2762f7f50ebb0b567 100644 (file)
--- a/lib/isc/include/pk11/pk11.h
+++ b/lib/isc/include/pk11/pk11.h
@@ -165,7 +165,7 @@ pkcs_C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type,
 
 CK_RV
 pkcs_C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApplication,
-                  CK_RV                 (*Notify)(CK_SESSION_HANDLE hSession,
+                  CK_RV (*Notify)(CK_SESSION_HANDLE hSession,
                                   CK_NOTIFICATION   event,
                                   CK_VOID_PTR       pApplication),
                   CK_SESSION_HANDLE_PTR phSession);

diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h
index 9dd35a545851b80add38b7af768ac82b2085c01b..6f831919df71e3e4d994d106417d8e12f4494708 100644 (file)
--- a/lib/isc/pthreads/include/isc/thread.h
+++ b/lib/isc/pthreads/include/isc/thread.h
@@ -34,9 +34,9 @@ extern __thread size_t isc_tid_v;
 
 ISC_LANG_BEGINDECLS
 
-typedef pthread_t         isc_thread_t;
-typedef void             *isc_threadresult_t;
-typedef void             *isc_threadarg_t;
+typedef pthread_t isc_thread_t;
+typedef void    *isc_threadresult_t;
+typedef void    *isc_threadarg_t;
 typedef isc_threadresult_t (*isc_threadfunc_t)(isc_threadarg_t);
 
 void

diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 37f91ff4dbc1dfca7a1ba514b5d4a49c01daa895..7c460d22e75844544568a9cd2cf514d37bf4f59f 100644 (file)
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -496,11 +496,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. */
@@ -522,7 +522,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 c127fdd6b4941c0b53fb4a8ddabce94f62f8fe9f..0bc40e06ba6c9ea33c06447b2f19c38bfa106436 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -94,9 +94,9 @@ typedef struct cfg_duration cfg_duration_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
@@ -108,7 +108,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;
@@ -597,7 +597,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 a25725505fd7aea7b4c43cd52c5eed70af4c85d4..d1e2fde4073027fe4e4c2aed7ce3658b509b8c7a 100644 (file)
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -200,15 +200,15 @@ struct ns_client {
        uint16_t        udpsize;
        uint16_t        extflags;
        int16_t         ednsversion; /* -1 noedns */
-       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 */
-       bool            mortal;     /*%< Die after handling request */
-       isc_quota_t    *recursionquota;
+       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 */
+       bool          mortal;     /*%< Die after handling request */
+       isc_quota_t  *recursionquota;
 
        isc_sockaddr_t peeraddr;
        bool           peeraddr_valid;