]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Update the source code formatting using clang-format-13
authorOndřej Surý <ondrej@sury.org>
Tue, 12 Oct 2021 06:57:47 +0000 (08:57 +0200)
committerOndřej Surý <ondrej@sury.org>
Tue, 12 Oct 2021 09:31:55 +0000 (11:31 +0200)
clang-format-13 fixed some of the formatting that clang-format-12 got
wrong.  Update the formatting.

(cherry picked from commit ed95f9fba3897126d0902db0053e6e776176bd40)

84 files changed:
bin/dig/include/dig/dig.h
bin/named/include/named/globals.h
bin/named/include/named/server.h
contrib/dlz/drivers/include/dlz/sdlz_helper.h
contrib/dlz/modules/include/dlz_dbi.h
contrib/dlz/modules/include/dlz_minimal.h
lib/dns/include/dns/acl.h
lib/dns/include/dns/adb.h
lib/dns/include/dns/callbacks.h
lib/dns/include/dns/catz.h
lib/dns/include/dns/clientinfo.h
lib/dns/include/dns/compress.h
lib/dns/include/dns/db.h
lib/dns/include/dns/dbiterator.h
lib/dns/include/dns/diff.h
lib/dns/include/dns/dispatch.h
lib/dns/include/dns/dlz.h
lib/dns/include/dns/dlz_dlopen.h
lib/dns/include/dns/dnsrps.h
lib/dns/include/dns/dyndb.h
lib/dns/include/dns/geoip.h
lib/dns/include/dns/ipkeylist.h
lib/dns/include/dns/iptable.h
lib/dns/include/dns/kasp.h
lib/dns/include/dns/librpz.h
lib/dns/include/dns/log.h
lib/dns/include/dns/lookup.h
lib/dns/include/dns/masterdump.h
lib/dns/include/dns/message.h
lib/dns/include/dns/name.h
lib/dns/include/dns/nsec3.h
lib/dns/include/dns/nta.h
lib/dns/include/dns/peer.h
lib/dns/include/dns/rbt.h
lib/dns/include/dns/rdata.h
lib/dns/include/dns/rdatalist.h
lib/dns/include/dns/rdataset.h
lib/dns/include/dns/rdatasetiter.h
lib/dns/include/dns/resolver.h
lib/dns/include/dns/rpz.h
lib/dns/include/dns/rriterator.h
lib/dns/include/dns/rrl.h
lib/dns/include/dns/sdb.h
lib/dns/include/dns/sdlz.h
lib/dns/include/dns/tcpmsg.h
lib/dns/include/dns/tkey.h
lib/dns/include/dns/tsig.h
lib/dns/include/dns/types.h
lib/dns/include/dns/validator.h
lib/dns/include/dns/view.h
lib/dns/resolver.c
lib/irs/include/irs/dnsconf.h
lib/irs/win32/include/irs/netdb.h
lib/isc/include/isc/backtrace.h
lib/isc/include/isc/buffer.h
lib/isc/include/isc/event.h
lib/isc/include/isc/httpd.h
lib/isc/include/isc/lex.h
lib/isc/include/isc/lfsr.h
lib/isc/include/isc/log.h
lib/isc/include/isc/quota.h
lib/isc/include/isc/radix.h
lib/isc/include/isc/region.h
lib/isc/include/isc/socket.h
lib/isc/include/isc/symtab.h
lib/isc/include/isc/util.h
lib/isc/include/pk11/pk11.h
lib/isc/include/pkcs11/pkcs11.h
lib/isc/pthreads/include/isc/thread.h
lib/isc/unix/include/isc/dir.h
lib/isc/win32/include/isc/thread.h
lib/isccc/include/isccc/ccmsg.h
lib/isccc/include/isccc/sexpr.h
lib/isccc/include/isccc/symtab.h
lib/isccc/include/isccc/util.h
lib/isccfg/include/isccfg/cfg.h
lib/isccfg/include/isccfg/grammar.h
lib/ns/include/ns/client.h
lib/ns/include/ns/hooks.h
lib/ns/include/ns/interfacemgr.h
lib/ns/include/ns/log.h
lib/ns/include/ns/query.h
lib/ns/include/ns/server.h
lib/ns/include/ns/sortlist.h

index 92e415b5f0c34a717b48387f3ae5a2e7eebe0070..9e6035255faa2d6a25a25c11152c7506a1b10653 100644 (file)
@@ -127,18 +127,18 @@ struct dig_lookup {
        isc_buffer_t     namebuf;
        isc_buffer_t     onamebuf;
        isc_buffer_t     renderbuf;
-       char *           sendspace;
-       dns_name_t *     name;
+       char         *sendspace;
+       dns_name_t         *name;
        isc_interval_t   interval;
-       dns_message_t *  sendmsg;
-       dns_name_t *     oname;
+       dns_message_t   *sendmsg;
+       dns_name_t         *oname;
        ISC_LINK(dig_lookup_t) link;
        ISC_LIST(dig_query_t) q;
        ISC_LIST(dig_query_t) connecting;
-       dig_query_t *     current_query;
+       dig_query_t         *current_query;
        dig_serverlist_t  my_server_list;
        dig_searchlist_t *origin;
-       dig_query_t *     xfr_q;
+       dig_query_t         *xfr_q;
        uint32_t          retries;
        int               nsfound;
        int16_t           udpsize;
@@ -147,13 +147,13 @@ struct dig_lookup {
        uint32_t          ixfr_serial;
        isc_buffer_t      rdatabuf;
        char              rdatastore[MXNAME];
-       dst_context_t *   tsigctx;
-       isc_buffer_t *    querysig;
+       dst_context_t    *tsigctx;
+       isc_buffer_t     *querysig;
        uint32_t          msgcounter;
        dns_fixedname_t   fdomain;
-       isc_sockaddr_t *  ecs_addr;
-       char *            cookie;
-       dns_ednsopt_t *   ednsopts;
+       isc_sockaddr_t   *ecs_addr;
+       char         *cookie;
+       dns_ednsopt_t    *ednsopts;
        unsigned int      ednsoptscnt;
        isc_dscp_t        dscp;
        unsigned int      ednsflags;
@@ -174,10 +174,10 @@ struct dig_query {
        uint32_t      msg_count;
        uint32_t      rr_count;
        bool          ixfr_axfr;
-       char *        servname;
-       char *        userarg;
+       char         *servname;
+       char         *userarg;
        isc_buffer_t  recvbuf, lengthbuf, tmpsendbuf, sendbuf;
-       char *        recvspace, *tmpsendspace, lengthspace[4];
+       char         *recvspace, *tmpsendspace, lengthspace[4];
        isc_socket_t *sock;
        ISC_LINK(dig_query_t) link;
        ISC_LINK(dig_query_t) clink;
@@ -185,7 +185,7 @@ struct dig_query {
        isc_time_t     time_sent;
        isc_time_t     time_recv;
        uint64_t       byte_count;
-       isc_timer_t *  timer;
+       isc_timer_t   *timer;
 };
 
 struct dig_server {
@@ -215,7 +215,7 @@ extern bool check_ra, have_ipv4, have_ipv6, specified_source, usesearch,
        showsearch, yaml;
 extern in_port_t        port;
 extern unsigned int     timeout;
-extern isc_mem_t *      mctx;
+extern isc_mem_t        *mctx;
 extern int              sendcount;
 extern int              ndots;
 extern int              lookup_counter;
@@ -226,10 +226,10 @@ extern char                keyfile[MXNAME];
 extern char             keysecret[MXNAME];
 extern const dns_name_t *hmacname;
 extern unsigned int     digestbits;
-extern dns_tsigkey_t *  tsigkey;
+extern dns_tsigkey_t    *tsigkey;
 extern bool             validated;
-extern isc_taskmgr_t *  taskmgr;
-extern isc_task_t *     global_task;
+extern isc_taskmgr_t    *taskmgr;
+extern isc_task_t        *global_task;
 extern bool             free_now;
 extern bool             debugging, debugtiming, memdebugging;
 extern bool             keep_open;
@@ -337,7 +337,7 @@ set_search_domain(char *domain);
  * Routines to be defined in dig.c, host.c, and nslookup.c. and
  * then assigned to the appropriate function pointer
  */
-extern isc_result_t (*dighost_printmessage)(dig_query_t *      query,
+extern isc_result_t (*dighost_printmessage)(dig_query_t        *query,
                                            const isc_buffer_t *msgbuf,
                                            dns_message_t *msg, bool headers);
 
index 4b6515f5d6eda9c4a730d87043472fb9e03bb301..0572154834d27b1eaf260b636bb2b8028f754408 100644 (file)
 #define NAMED_RUN_PID_DIR 1
 #endif /* ifndef NAMED_RUN_PID_DIR */
 
-EXTERN isc_mem_t *named_g_mctx     INIT(NULL);
-EXTERN unsigned int named_g_cpus    INIT(0);
-EXTERN unsigned int named_g_udpdisp INIT(0);
-EXTERN isc_taskmgr_t *named_g_taskmgr INIT(NULL);
+EXTERN isc_mem_t *named_g_mctx               INIT(NULL);
+EXTERN unsigned int named_g_cpus             INIT(0);
+EXTERN unsigned int named_g_udpdisp          INIT(0);
+EXTERN isc_taskmgr_t *named_g_taskmgr        INIT(NULL);
 EXTERN dns_dispatchmgr_t *named_g_dispatchmgr INIT(NULL);
 EXTERN unsigned int named_g_cpus_detected     INIT(1);
 
@@ -60,42 +60,42 @@ EXTERN bool named_g_run_done INIT(false);
  *         for really short timers, another for client timers, and one
  *         for zone timers.
  */
-EXTERN isc_timermgr_t *named_g_timermgr INIT(NULL);
+EXTERN isc_timermgr_t *named_g_timermgr          INIT(NULL);
 EXTERN isc_socketmgr_t *named_g_socketmgr INIT(NULL);
-EXTERN isc_nm_t *named_g_nm INIT(NULL);
-EXTERN cfg_parser_t *named_g_parser INIT(NULL);
-EXTERN cfg_parser_t *named_g_addparser INIT(NULL);
-EXTERN const char *named_g_version     INIT(VERSION);
-EXTERN const char *named_g_product     INIT(PRODUCT);
-EXTERN const char *named_g_description INIT(DESCRIPTION);
-EXTERN const char *named_g_srcid       INIT(SRCID);
-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
-EXTERN const char *named_g_builder     INIT(BUILDER);
-EXTERN in_port_t named_g_port         INIT(0);
-EXTERN isc_dscp_t named_g_dscp        INIT(-1);
+EXTERN isc_nm_t *named_g_nm              INIT(NULL);
+EXTERN cfg_parser_t *named_g_parser      INIT(NULL);
+EXTERN cfg_parser_t *named_g_addparser   INIT(NULL);
+EXTERN const char *named_g_version       INIT(VERSION);
+EXTERN const char *named_g_product       INIT(PRODUCT);
+EXTERN const char *named_g_description   INIT(DESCRIPTION);
+EXTERN const char *named_g_srcid         INIT(SRCID);
+EXTERN const char *named_g_configargs    INIT(CONFIGARGS);
+EXTERN const char *named_g_builder       INIT(BUILDER);
+EXTERN in_port_t named_g_port            INIT(0);
+EXTERN isc_dscp_t named_g_dscp           INIT(-1);
 
 EXTERN named_server_t *named_g_server INIT(NULL);
 
 /*
  * Logging.
  */
-EXTERN isc_log_t *named_g_lctx INIT(NULL);
+EXTERN isc_log_t *named_g_lctx              INIT(NULL);
 EXTERN isc_logcategory_t *named_g_categories INIT(NULL);
-EXTERN isc_logmodule_t *named_g_modules INIT(NULL);
-EXTERN unsigned int named_g_debuglevel INIT(0);
+EXTERN isc_logmodule_t *named_g_modules             INIT(NULL);
+EXTERN unsigned int named_g_debuglevel      INIT(0);
 
 /*
  * Current configuration information.
  */
-EXTERN cfg_obj_t *named_g_config INIT(NULL);
+EXTERN cfg_obj_t *named_g_config          INIT(NULL);
 EXTERN const cfg_obj_t *named_g_defaults   INIT(NULL);
 EXTERN const char *named_g_conffile       INIT(NAMED_SYSCONFDIR "/named.conf");
 EXTERN const char *named_g_defaultbindkeys INIT(NAMED_SYSCONFDIR "/bind.keys");
 EXTERN const char *named_g_keyfile        INIT(NAMED_SYSCONFDIR "/rndc.key");
 
-EXTERN dns_tsigkey_t *named_g_sessionkey INIT(NULL);
-EXTERN dns_name_t                       named_g_sessionkeyname;
-EXTERN bool named_g_conffileset                 INIT(false);
+EXTERN dns_tsigkey_t *named_g_sessionkey    INIT(NULL);
+EXTERN dns_name_t                          named_g_sessionkeyname;
+EXTERN bool named_g_conffileset                    INIT(false);
 EXTERN cfg_aclconfctx_t *named_g_aclconfctx INIT(NULL);
 
 /*
index b0006cc9503a3e113fda2a4a63a9866250c75041..4fbe7d528af3fdb0a5b14110b71ef530b0110d54 100644 (file)
@@ -46,7 +46,7 @@
  */
 struct named_server {
        unsigned int magic;
-       isc_mem_t *  mctx;
+       isc_mem_t         *mctx;
 
        ns_server_t *sctx;
 
@@ -67,12 +67,12 @@ struct named_server {
                             * */
 
        /* Server data structures. */
-       dns_loadmgr_t *    loadmgr;
-       dns_zonemgr_t *    zonemgr;
+       dns_loadmgr_t     *loadmgr;
+       dns_zonemgr_t     *zonemgr;
        dns_viewlist_t     viewlist;
        dns_kasplist_t     kasplist;
        ns_interfacemgr_t *interfacemgr;
-       dns_db_t *         in_roothints;
+       dns_db_t                 *in_roothints;
 
        isc_timer_t *interface_timer;
        isc_timer_t *heartbeat_timer;
@@ -94,15 +94,15 @@ struct named_server {
        isc_stats_t *resolverstats;  /*% Resolver stats */
        isc_stats_t *sockstats;      /*%< Socket stats */
 
-       named_controls_t *   controls; /*%< Control channels */
+       named_controls_t         *controls; /*%< Control channels */
        unsigned int         dispatchgen;
        named_dispatchlist_t dispatches;
 
        named_statschannellist_t statschannels;
 
        dns_tsigkey_t *sessionkey;
-       char *         session_keyfile;
-       dns_name_t *   session_keyname;
+       char         *session_keyfile;
+       dns_name_t         *session_keyname;
        unsigned int   session_keyalg;
        uint16_t       session_keybits;
        bool           interface_auto;
index d46db7c21ad097e05b3f6c946635423db92dc16d..dcc83b6b76570dd064f6c715c5586a2b01abcc78 100644 (file)
@@ -57,7 +57,7 @@ typedef struct driverinstance driverinstance_t;
  * special tokens are %zone%, %record%, %client%
  */
 struct query_segment {
-       void *       sql;
+       void         *sql;
        unsigned int strlen;
        bool         direct;
        ISC_LINK(query_segment_t) link;
@@ -71,18 +71,18 @@ struct query_segment {
  * make sure no two threads try to use the same DBI at a time.
  */
 struct dbinstance {
-       void *        dbconn;
+       void         *dbconn;
        query_list_t *allnodes_q;
        query_list_t *allowxfr_q;
        query_list_t *authority_q;
        query_list_t *findzone_q;
        query_list_t *lookup_q;
        query_list_t *countzone_q;
-       char *        query_buf;
-       char *        zone;
-       char *        record;
-       char *        client;
-       isc_mem_t *   mctx;
+       char         *query_buf;
+       char         *zone;
+       char         *record;
+       char         *client;
+       isc_mem_t         *mctx;
        isc_mutex_t   instance_lock;
        ISC_LINK(dbinstance_t) link;
 };
index 735359c8731893df59e0b54fa0385dde6fa08abd..c4ce143718b16a1beeb80a128599fae5859335cf 100644 (file)
@@ -61,7 +61,7 @@ typedef struct driverinstance driverinstance_t;
  * special tokens are %zone%, %record%, %client%
  */
 struct query_segment {
-       void *       cmd;
+       void         *cmd;
        unsigned int strlen;
        bool         direct;
        DLZ_LINK(query_segment_t) link;
@@ -75,17 +75,17 @@ struct query_segment {
  * make sure no two threads try to use the same DBI at a time.
  */
 struct dbinstance {
-       void *        dbconn;
+       void         *dbconn;
        query_list_t *allnodes_q;
        query_list_t *allowxfr_q;
        query_list_t *authority_q;
        query_list_t *findzone_q;
        query_list_t *lookup_q;
        query_list_t *countzone_q;
-       char *        query_buf;
-       char *        zone;
-       char *        record;
-       char *        client;
+       char         *query_buf;
+       char         *zone;
+       char         *record;
+       char         *client;
        dlz_mutex_t   lock;
        DLZ_LINK(dbinstance_t) link;
 };
index bac8ab12d19904ffacf1b97facd29718914df9f7..86318f68cb5e98745e2ad19792858b2be423dc91 100644 (file)
@@ -82,7 +82,7 @@ typedef uint32_t     dns_ttl_t;
        do {                           \
                union {                \
                        const void *k; \
-                       void *      v; \
+                       void         *v; \
                } _u;                  \
                _u.k = konst;          \
                var = _u.v;            \
@@ -109,21 +109,21 @@ typedef struct isc_sockaddr {
 #endif /* ifdef ISC_PLATFORM_HAVESYSUNH */
        } type;
        unsigned int length;
-       void *       link;
+       void         *link;
 } isc_sockaddr_t;
 
 #define DNS_CLIENTINFO_VERSION 2
 typedef struct dns_clientinfo {
        uint16_t version;
-       void *   data;
-       void *   dbversion;
+       void    *data;
+       void    *dbversion;
 } dns_clientinfo_t;
 
 typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client,
-                                                 isc_sockaddr_t ** addrp);
+                                                 isc_sockaddr_t         **addrp);
 
 typedef isc_result_t (*dns_clientinfo_version_t)(dns_clientinfo_t *client,
-                                                void **           addrp);
+                                                void         **addrp);
 
 #define DNS_CLIENTINFOMETHODS_VERSION 2
 #define DNS_CLIENTINFOMETHODS_AGE     1
index 3070a35bac0e7e649a7736d3dc43c35bed927649..7c49b437d0e1e63cb55ccd148cc77f44271887b0 100644 (file)
@@ -75,14 +75,14 @@ struct dns_aclelement {
 
 struct dns_acl {
        unsigned int      magic;
-       isc_mem_t *       mctx;
+       isc_mem_t         *mctx;
        isc_refcount_t    refcount;
-       dns_iptable_t *   iptable;
+       dns_iptable_t    *iptable;
        dns_aclelement_t *elements;
        bool              has_negatives;
        unsigned int      alloc;         /*%< Elements allocated */
        unsigned int      length;        /*%< Elements initialized */
-       char *            name;          /*%< Temporary use only */
+       char         *name;              /*%< Temporary use only */
        ISC_LINK(dns_acl_t) nextincache; /*%< Ditto */
 };
 
index c2a4bfebb9cc2413cef403e1261a84625c2692ee..b9c5b849d2dc8d5762fa5fafb71b1d298463eec8 100644 (file)
@@ -118,7 +118,7 @@ struct dns_adbfind {
        int            name_bucket;
        unsigned int   flags;
        dns_adbname_t *adbname;
-       dns_adb_t *    adb;
+       dns_adb_t         *adb;
        isc_event_t    event;
        ISC_LINK(dns_adbfind_t) plink;
 };
index 6ad980a01d56b3f8713244732fa477ca44c12a7a..36cacdc719ed6b3f4cf6d50e65ce1daef387a014 100644 (file)
@@ -51,7 +51,7 @@ struct dns_rdatacallbacks {
         * to pass back information obtained from the file header
         */
        dns_rawdatafunc_t rawdata;
-       dns_zone_t *      zone;
+       dns_zone_t         *zone;
 
        /*%
         * dns_load_master / dns_rdata_fromtext call this to issue a error.
index 1d693d4f794ee2be6e91ae9ed049b8016f926e03..31d95dca4698f56162ed5d061741b99365a3c1d7 100644 (file)
@@ -321,15 +321,15 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
 /* Methods provided by named to dynamically modify the member zones */
 /* xxxwpk TODO config! */
 typedef isc_result_t (*dns_catz_zoneop_fn_t)(dns_catz_entry_t *entry,
-                                            dns_catz_zone_t origin,
-                                            dns_view_t *      view,
-                                            isc_taskmgr_t *   taskmgr,
-                                            void *            udata);
+                                            dns_catz_zone_t  *origin,
+                                            dns_view_t *view,
+                                            isc_taskmgr_t         *taskmgr,
+                                            void                 *udata);
 struct dns_catz_zonemodmethods {
        dns_catz_zoneop_fn_t addzone;
        dns_catz_zoneop_fn_t modzone;
        dns_catz_zoneop_fn_t delzone;
-       void *               udata;
+       void                 *udata;
 };
 
 isc_result_t
index fd72d9453d42600b407f3cebd5d6b8c823e38eb1..406150652772d803c63b757b39dd0447526fef5c 100644 (file)
@@ -50,12 +50,12 @@ ISC_LANG_BEGINDECLS
 #define DNS_CLIENTINFO_VERSION 2
 typedef struct dns_clientinfo {
        uint16_t version;
-       void *   data;
-       void *   dbversion;
+       void    *data;
+       void    *dbversion;
 } dns_clientinfo_t;
 
 typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client,
-                                                 isc_sockaddr_t ** addrp);
+                                                 isc_sockaddr_t         **addrp);
 
 #define DNS_CLIENTINFOMETHODS_VERSION 2
 #define DNS_CLIENTINFOMETHODS_AGE     1
@@ -70,7 +70,7 @@ typedef struct dns_clientinfomethods {
 ***** Methods
 *****/
 void
-dns_clientinfomethods_init(dns_clientinfomethods_t methods,
+dns_clientinfomethods_init(dns_clientinfomethods_t  *methods,
                           dns_clientinfo_sourceip_t sourceip);
 
 void
index 9c0ea5695abc7c96745c08d73d7d48e79d2dfd6f..dc17e1436014b93b3c7e2f6c6f5a6fb5f673ff0b 100644 (file)
@@ -76,7 +76,7 @@ struct dns_compress {
        /*% Preallocated nodes for the table. */
        dns_compressnode_t initialnodes[DNS_COMPRESS_INITIALNODES];
        uint16_t           count; /*%< Number of nodes. */
-       isc_mem_t *        mctx;  /*%< Memory context. */
+       isc_mem_t         *mctx;  /*%< Memory context. */
 };
 
 typedef enum {
index fe36759a2cb75f444550583699a6e96e0bbbfbeb..90bd7fb112e9e6bc572be97625496bfefe14a37f 100644 (file)
@@ -71,13 +71,13 @@ ISC_LANG_BEGINDECLS
 typedef struct dns_dbmethods {
        void (*attach)(dns_db_t *source, dns_db_t **targetp);
        void (*detach)(dns_db_t **dbp);
-       isc_result_t (*beginload)(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);
        isc_result_t (*serialize)(dns_db_t *db, dns_dbversion_t *version,
                                  FILE *file);
        isc_result_t (*dump)(dns_db_t *db, dns_dbversion_t *version,
-                            const char *       filename,
+                            const char *filename,
                             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);
@@ -96,7 +96,7 @@ typedef struct dns_dbmethods {
        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_name_t     *dcname,
                                    dns_rdataset_t *rdataset,
                                    dns_rdataset_t *sigrdataset);
        void (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
@@ -114,7 +114,7 @@ typedef struct dns_dbmethods {
                                     dns_rdataset_t *rdataset,
                                     dns_rdataset_t *sigrdataset);
        isc_result_t (*allrdatasets)(dns_db_t *db, dns_dbnode_t *node,
-                                    dns_dbversion_t *    version,
+                                    dns_dbversion_t     *version,
                                     isc_stdtime_t        now,
                                     dns_rdatasetiter_t **iteratorp);
        isc_result_t (*addrdataset)(dns_db_t *db, dns_dbnode_t *node,
@@ -124,9 +124,9 @@ typedef struct dns_dbmethods {
                                    dns_rdataset_t *addedrdataset);
        isc_result_t (*subtractrdataset)(dns_db_t *db, dns_dbnode_t *node,
                                         dns_dbversion_t *version,
-                                        dns_rdataset_t * rdataset,
+                                        dns_rdataset_t *rdataset,
                                         unsigned int     options,
-                                        dns_rdataset_t * newrdataset);
+                                        dns_rdataset_t *newrdataset);
        isc_result_t (*deleterdataset)(dns_db_t *db, dns_dbnode_t *node,
                                       dns_dbversion_t *version,
                                       dns_rdatatype_t  type,
@@ -139,12 +139,12 @@ typedef struct dns_dbmethods {
        isc_result_t (*getoriginnode)(dns_db_t *db, dns_dbnode_t **nodep);
        void (*transfernode)(dns_db_t *db, dns_dbnode_t **sourcep,
                             dns_dbnode_t **targetp);
-       isc_result_t (*getnsec3parameters)(dns_db_t *       db,
+       isc_result_t (*getnsec3parameters)(dns_db_t         *db,
                                           dns_dbversion_t *version,
                                           dns_hash_t *hash, uint8_t *flags,
-                                          uint16_t *     iterations,
+                                          uint16_t         *iterations,
                                           unsigned char *salt,
-                                          size_t *       salt_len);
+                                          size_t         *salt_len);
        isc_result_t (*findnsec3node)(dns_db_t *db, const dns_name_t *name,
                                      bool create, dns_dbnode_t **nodep);
        isc_result_t (*setsigningtime)(dns_db_t *db, dns_rdataset_t *rdataset,
@@ -160,16 +160,16 @@ typedef struct dns_dbmethods {
        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_clientinfo_t         *clientinfo,
+                                   dns_dbnode_t                 **nodep);
        isc_result_t (*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_clientinfo_t         *clientinfo,
+                               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);
        isc_result_t (*nodefullname)(dns_db_t *db, dns_dbnode_t *node,
@@ -184,7 +184,7 @@ typedef struct dns_dbmethods {
        isc_result_t (*adjusthashsize)(dns_db_t *db, size_t size);
 } dns_dbmethods_t;
 
-typedef isc_result_t (*dns_dbcreatefunc_t)(isc_mem_t *      mctx,
+typedef isc_result_t (*dns_dbcreatefunc_t)(isc_mem_t        *mctx,
                                           const dns_name_t *name,
                                           dns_dbtype_t      type,
                                           dns_rdataclass_t  rdclass,
@@ -212,7 +212,7 @@ struct dns_db {
        uint16_t         attributes;
        dns_rdataclass_t rdclass;
        dns_name_t       origin;
-       isc_mem_t *      mctx;
+       isc_mem_t         *mctx;
        ISC_LIST(dns_dbonupdatelistener_t) update_listeners;
 };
 
@@ -221,7 +221,7 @@ struct dns_db {
 
 struct dns_dbonupdatelistener {
        dns_dbupdate_callback_t onupdate;
-       void *                  onupdate_arg;
+       void                 *onupdate_arg;
        ISC_LINK(dns_dbonupdatelistener_t) link;
 };
 
index bac1b8806bca3337f52d5bb4a5f53cafd933e1f1..7750a2f2514e5a48998a2ee62160b3c5a8cfcf51 100644 (file)
@@ -96,7 +96,7 @@ struct dns_dbiterator {
        /* Unlocked. */
        unsigned int             magic;
        dns_dbiteratormethods_t *methods;
-       dns_db_t *               db;
+       dns_db_t                 *db;
        bool                     relative_names;
        bool                     cleaning;
 };
index b3ae0054bd77d55fadbcb9f3e8b90451ce16cc39..39fb1a9c05617158461091ac4f653599062ad88c 100644 (file)
@@ -73,7 +73,7 @@ typedef ISC_LIST(dns_difftuple_t) dns_difftuplelist_t;
 
 struct dns_difftuple {
        unsigned int magic;
-       isc_mem_t *  mctx;
+       isc_mem_t         *mctx;
        dns_diffop_t op;
        dns_name_t   name;
        dns_ttl_t    ttl;
@@ -94,7 +94,7 @@ typedef struct dns_diff dns_diff_t;
 
 struct dns_diff {
        unsigned int        magic;
-       isc_mem_t *         mctx;
+       isc_mem_t         *mctx;
        dns_difftuplelist_t tuples;
 };
 
index 5e3cc85f02526e636c80cf48e52da30b265e6839..0991c014611faaf1ed723d1cb8cee1e8d0f564bd 100644 (file)
@@ -89,7 +89,7 @@ struct dns_dispatchevent {
  * round-robin fashion.
  */
 struct dns_dispatchset {
-       isc_mem_t *      mctx;
+       isc_mem_t         *mctx;
        dns_dispatch_t **dispatches;
        int              ndisp;
        int              cur;
@@ -198,7 +198,7 @@ dns_dispatchmgr_getblackhole(dns_dispatchmgr_t *mgr);
 
 void
 dns_dispatchmgr_setblackportlist(dns_dispatchmgr_t *mgr,
-                                dns_portlist_t *   portlist);
+                                dns_portlist_t *portlist);
 /*%<
  * This function is deprecated.  Use dns_dispatchmgr_setavailports() instead.
  *
@@ -412,7 +412,7 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, unsigned int options,
  */
 
 void
-dns_dispatch_removeresponse(dns_dispentry_t **   resp,
+dns_dispatch_removeresponse(dns_dispentry_t        **resp,
                            dns_dispatchevent_t **sockevent);
 /*%<
  * Stops the flow of responses for the provided id and destination.
index e1020fab4e65e7ac9b82c357aba70961c320628f..549b74415f2195810da71176c96d8a1da8ec9749 100644 (file)
@@ -97,11 +97,11 @@ ISC_LANG_BEGINDECLS
 #define DNS_DLZ_VALID(dlz) ISC_MAGIC_VALID(dlz, DNS_DLZ_MAGIC)
 
 typedef isc_result_t (*dns_dlzallowzonexfr_t)(void *driverarg, void *dbdata,
-                                             isc_mem_t *           mctx,
+                                             isc_mem_t         *mctx,
                                              dns_rdataclass_t      rdclass,
-                                             const dns_name_t *    name,
+                                             const dns_name_t     *name,
                                              const isc_sockaddr_t *clientaddr,
-                                             dns_db_t **           dbp);
+                                             dns_db_t         **dbp);
 
 /*%<
  * Method prototype.  Drivers implementing the DLZ interface MUST
@@ -135,12 +135,12 @@ typedef void (*dns_dlzdestroy_t)(void *driverarg, void **dbdata);
  */
 
 typedef isc_result_t (*dns_dlzfindzone_t)(void *driverarg, void *dbdata,
-                                         isc_mem_t *              mctx,
+                                         isc_mem_t                 *mctx,
                                          dns_rdataclass_t         rdclass,
-                                         const dns_name_t *       name,
+                                         const dns_name_t         *name,
                                          dns_clientinfomethods_t *methods,
-                                         dns_clientinfo_t *       clientinfo,
-                                         dns_db_t **              dbp);
+                                         dns_clientinfo_t         *clientinfo,
+                                         dns_db_t                 **dbp);
 
 /*%<
  * Method prototype.  Drivers implementing the DLZ interface MUST
@@ -167,7 +167,7 @@ typedef isc_result_t (*dns_dlzfindzone_t)(void *driverarg, void *dbdata,
  */
 
 typedef isc_result_t (*dns_dlzconfigure_t)(void *driverarg, void *dbdata,
-                                          dns_view_t view,
+                                          dns_view_t  *view,
                                           dns_dlzdb_t *dlzdb);
 /*%<
  * Method prototype.  Drivers implementing the DLZ interface may
@@ -176,8 +176,8 @@ typedef isc_result_t (*dns_dlzconfigure_t)(void *driverarg, void *dbdata,
  * may call configuration functions during the configure call
  */
 
-typedef bool (*dns_dlzssumatch_t)(const dns_name_t *   signer,
-                                 const dns_name_t *   name,
+typedef bool (*dns_dlzssumatch_t)(const dns_name_t        *signer,
+                                 const dns_name_t         *name,
                                  const isc_netaddr_t *tcpaddr,
                                  dns_rdatatype_t type, const dst_key_t *key,
                                  void *driverarg, void *dbdata);
@@ -199,10 +199,10 @@ typedef struct dns_dlzmethods {
 
 /*% information about a DLZ driver */
 struct dns_dlzimplementation {
-       const char *            name;
+       const char                 *name;
        const dns_dlzmethods_t *methods;
-       isc_mem_t *             mctx;
-       void *                  driverarg;
+       isc_mem_t                 *mctx;
+       void                 *driverarg;
        ISC_LINK(dns_dlzimplementation_t) link;
 };
 
@@ -212,12 +212,12 @@ typedef isc_result_t (*dlzconfigure_callback_t)(dns_view_t *, dns_dlzdb_t *,
 /*% An instance of a DLZ driver */
 struct dns_dlzdb {
        unsigned int             magic;
-       isc_mem_t *              mctx;
+       isc_mem_t                 *mctx;
        dns_dlzimplementation_t *implementation;
-       void *                   dbdata;
+       void                 *dbdata;
        dlzconfigure_callback_t  configure_callback;
        bool                     search;
-       char *                   dlzname;
+       char                 *dlzname;
        ISC_LINK(dns_dlzdb_t) link;
        dns_ssutable_t *ssutable;
 };
index fb2f2c5af1a7085bd587ee13d6a698a95c868c66..1066156e22822e8c1468d3809a048bb2401f85ae 100644 (file)
@@ -56,7 +56,7 @@ dlz_dlopen_destroy_t(void *dbdata);
 typedef isc_result_t
 dlz_dlopen_findzonedb_t(void *dbdata, const char *name,
                        dns_clientinfomethods_t *methods,
-                       dns_clientinfo_t *       clientinfo);
+                       dns_clientinfo_t         *clientinfo);
 
 /*
  * dlz_dlopen_lookup() is required for all DLZ external drivers
index 6381579f0dcb8e35d1bb5f219a58147e8a210361..a9af86f3bb4905d192a19046ee512f733f14406f 100644 (file)
@@ -49,9 +49,9 @@ typedef struct rpsdb {
        int                 ref_cnt;
        librpz_result_id_t  hit_id;
        librpz_result_t     result;
-       librpz_rsp_t *      rsp;
+       librpz_rsp_t         *rsp;
        librpz_domain_buf_t origin_buf;
-       const dns_name_t *  qname;
+       const dns_name_t         *qname;
        rpsnode_t           origin_node;
        rpsnode_t           data_node;
 } rpsdb_t;
index ac06281dd5bd09a1dd201e381a1eba5581cbf684..3d58b6c723b6c335d70a30877b82ddf9734d209e 100644 (file)
@@ -33,14 +33,14 @@ ISC_LANG_BEGINDECLS
  */
 struct dns_dyndbctx {
        unsigned int    magic;
-       const void *    hashinit;
-       isc_mem_t *     mctx;
-       isc_log_t *     lctx;
-       dns_view_t *    view;
-       dns_zonemgr_t zmgr;
-       isc_task_t *    task;
+       const void         *hashinit;
+       isc_mem_t         *mctx;
+       isc_log_t         *lctx;
+       dns_view_t         *view;
+       dns_zonemgr_t  *zmgr;
+       isc_task_t         *task;
        isc_timermgr_t *timermgr;
-       unsigned int *  memdebug;
+       unsigned int   *memdebug;
 };
 
 #define DNS_DYNDBCTX_MAGIC    ISC_MAGIC('D', 'd', 'b', 'c')
index 14af51450a93fc5a581217ceaccc62c425e0ae0d..45c9b9ea7904b20b1830c1b4dcf89c06f33c7186 100644 (file)
@@ -79,7 +79,7 @@ typedef enum {
 
 typedef struct dns_geoip_elem {
        dns_geoip_subtype_t subtype;
-       void *              db;
+       void                 *db;
        union {
                char as_string[256];
                int  as_int;
@@ -101,9 +101,9 @@ struct dns_geoip_databases {
 ISC_LANG_BEGINDECLS
 
 bool
-dns_geoip_match(const isc_netaddr_t *       reqaddr,
+dns_geoip_match(const isc_netaddr_t        *reqaddr,
                const dns_geoip_databases_t *geoip,
-               const dns_geoip_elem_t *     elt);
+               const dns_geoip_elem_t      *elt);
 
 ISC_LANG_ENDDECLS
 
index 1afce6541841b2a42262fe4686c79490373030f0..3dbf604ff351289791d7c909695f4c90defca261 100644 (file)
@@ -24,9 +24,9 @@
  */
 struct dns_ipkeylist {
        isc_sockaddr_t *addrs;
-       isc_dscp_t *    dscps;
-       dns_name_t **   keys;
-       dns_name_t **   labels;
+       isc_dscp_t         *dscps;
+       dns_name_t         **keys;
+       dns_name_t         **labels;
        uint32_t        count;
        uint32_t        allocated;
 };
index 818b24877386856ee92761f1a4eeb8c931f2714e..86255e6bdc6621449416994484150762f6ac26e8 100644 (file)
@@ -23,7 +23,7 @@
 
 struct dns_iptable {
        unsigned int      magic;
-       isc_mem_t *       mctx;
+       isc_mem_t         *mctx;
        isc_refcount_t    refcount;
        isc_radix_tree_t *radix;
        ISC_LINK(dns_iptable_t) nextincache;
index d39ad80e799347bfaf7989eb029d07c7b00eaa47..84fed27c683de6e933df31978984364c2fde34f6 100644 (file)
@@ -60,8 +60,8 @@ struct dns_kasp_nsec3param {
 /* Stores a DNSSEC policy */
 struct dns_kasp {
        unsigned int magic;
-       isc_mem_t *  mctx;
-       char *       name;
+       isc_mem_t         *mctx;
+       char         *name;
 
        /* Internals. */
        isc_mutex_t lock;
index 47793c63d63a19ad1e29cce76de7087ab45a91d7..7ae95f31334693d4ea78052c063d80388df8f5e6 100644 (file)
@@ -373,7 +373,7 @@ typedef struct librpz_client librpz_client_t;
  * @param mutex: pointer to the lock for the client handle
  * @param log_ctx: NULL or resolver's context log messages
  */
-typedef librpz_clist_t *(librpz_clist_create_t)(librpz_emsg_t emsg,
+typedef librpz_clist_t *(librpz_clist_create_t)(librpz_emsg_t  *emsg,
                                                librpz_mutex_t *lock,
                                                librpz_mutex_t *unlock,
                                                librpz_mutex_t *mutex_destroy,
@@ -394,9 +394,9 @@ LIBDEF_F(clist_detach)
  * @param use_expired: true to not ignore expired zones
  * @return client handle or NULL if the handle could not be created
  */
-typedef librpz_client_t *(librpz_client_create_t)(librpz_emsg_t emsg,
+typedef librpz_client_t *(librpz_client_create_t)(librpz_emsg_t        *emsg,
                                                  librpz_clist_t *clist,
-                                                 const char *    cstr,
+                                                 const char     *cstr,
                                                  bool            use_expired);
 LIBDEF_F(client_create)
 
@@ -493,9 +493,9 @@ LIBDEF_F(have_ns_trig)
  * @param[in,out] rsp state from librpz_itr_start()
  * @return false on error
  */
-typedef bool(librpz_rsp_clientip_prefix_t)(librpz_emsg_t *  emsg,
+typedef bool(librpz_rsp_clientip_prefix_t)(librpz_emsg_t        *emsg,
                                           librpz_prefix_t *prefix,
-                                          librpz_rsp_t *   rsp);
+                                          librpz_rsp_t *rsp);
 LIBDEF_F(rsp_clientip_prefix)
 
 /**
@@ -508,9 +508,9 @@ LIBDEF_F(rsp_clientip_prefix)
  * @param[in,out] rsp state from librpz_itr_start()
  * @return false on error
  */
-typedef bool(librpz_rsp_domain_t)(librpz_emsg_t *      emsg,
+typedef bool(librpz_rsp_domain_t)(librpz_emsg_t        *emsg,
                                  librpz_domain_buf_t *owner,
-                                 librpz_rsp_t *       rsp);
+                                 librpz_rsp_t         *rsp);
 LIBDEF_F(rsp_domain)
 
 /**
@@ -766,7 +766,7 @@ typedef socku_t *(librpz_mk_inet_su_t)(socku_t *su, const struct in_addr *addrp,
                                       in_port_t port);
 LIBDEF_F(mk_inet_su)
 
-typedef socku_t *(librpz_mk_inet6_su_t)(socku_t *             su,
+typedef socku_t *(librpz_mk_inet6_su_t)(socku_t                *su,
                                        const struct in6_addr *addrp,
                                        uint32_t scope_id, in_port_t port);
 LIBDEF_F(mk_inet6_su)
@@ -789,57 +789,57 @@ LIBDEF(const char *, librpz_dnsrpzd_path)
  * This is the dlopen() interface to librpz.
  */
 typedef const struct {
-       const char *                      dnsrpzd_path;
-       const char *                      version;
-       librpz_parse_log_opt_t *          parse_log_opt;
-       librpz_log_level_val_t *          log_level_val;
-       librpz_set_log_t *                set_log;
-       librpz_vpemsg_t *                 vpemsg;
-       librpz_pemsg_t *                  pemsg;
-       librpz_vlog_t *                   vlog;
-       librpz_log_t *                    log;
+       const char                         *dnsrpzd_path;
+       const char                         *version;
+       librpz_parse_log_opt_t         *parse_log_opt;
+       librpz_log_level_val_t         *log_level_val;
+       librpz_set_log_t                 *set_log;
+       librpz_vpemsg_t                 *vpemsg;
+       librpz_pemsg_t                 *pemsg;
+       librpz_vlog_t                 *vlog;
+       librpz_log_t                 *log;
        librpz_fatal_t *fatal             LIBRPZ_NORET;
        librpz_rpz_assert_t *rpz_assert   LIBRPZ_NORET;
        librpz_rpz_vassert_t *rpz_vassert LIBRPZ_NORET;
-       librpz_clist_create_t *           clist_create;
-       librpz_clist_detach_t *           clist_detach;
-       librpz_client_create_t *          client_create;
-       librpz_connect_t *                connect;
-       librpz_client_detach_t *          client_detach;
-       librpz_rsp_create_t *             rsp_create;
-       librpz_rsp_detach_t *             rsp_detach;
-       librpz_rsp_result_t *             rsp_result;
-       librpz_have_trig_t *              have_trig;
-       librpz_have_ns_trig_t *           have_ns_trig;
-       librpz_rsp_clientip_prefix_t *    rsp_clientip_prefix;
-       librpz_rsp_domain_t *             rsp_domain;
-       librpz_rsp_rr_t *                 rsp_rr;
-       librpz_rsp_soa_t *                rsp_soa;
-       librpz_soa_serial_t *             soa_serial;
-       librpz_rsp_push_t *               rsp_push;
-       librpz_rsp_pop_t *                rsp_pop;
-       librpz_rsp_pop_discard_t *        rsp_pop_discard;
-       librpz_rsp_forget_zone_t *        rsp_forget_zone;
-       librpz_ck_ip_t *                  ck_ip;
-       librpz_ck_domain_t *              ck_domain;
-       librpz_zone_refresh_t *           zone_refresh;
-       librpz_db_info_t *                db_info;
-       librpz_itr_start_t *              itr_start;
-       librpz_mf_stats_t *               mf_stats;
-       librpz_vers_stats_t *             vers_stats;
-       librpz_itr_zone_t *               itr_zone;
-       librpz_itr_node_t *               itr_node;
-       librpz_policy2str_t *             policy2str;
-       librpz_trig2str_t *               trig2str;
-       librpz_secs2str_t *               secs2str;
-       librpz_str2secs_t *               str2secs;
-       librpz_rtype2str_t *              rtype2str;
-       librpz_domain_ntop_t *            domain_ntop;
-       librpz_domain_pton2_t *           domain_pton2;
-       librpz_mk_inet_su_t *             mk_inet_su;
-       librpz_mk_inet6_su_t *            mk_inet6_su;
-       librpz_str2su_t *                 str2su;
-       librpz_su2str_t *                 su2str;
+       librpz_clist_create_t         *clist_create;
+       librpz_clist_detach_t         *clist_detach;
+       librpz_client_create_t         *client_create;
+       librpz_connect_t                 *connect;
+       librpz_client_detach_t         *client_detach;
+       librpz_rsp_create_t                 *rsp_create;
+       librpz_rsp_detach_t                 *rsp_detach;
+       librpz_rsp_result_t                 *rsp_result;
+       librpz_have_trig_t                 *have_trig;
+       librpz_have_ns_trig_t         *have_ns_trig;
+       librpz_rsp_clientip_prefix_t     *rsp_clientip_prefix;
+       librpz_rsp_domain_t                 *rsp_domain;
+       librpz_rsp_rr_t                 *rsp_rr;
+       librpz_rsp_soa_t                 *rsp_soa;
+       librpz_soa_serial_t                 *soa_serial;
+       librpz_rsp_push_t                 *rsp_push;
+       librpz_rsp_pop_t                 *rsp_pop;
+       librpz_rsp_pop_discard_t         *rsp_pop_discard;
+       librpz_rsp_forget_zone_t         *rsp_forget_zone;
+       librpz_ck_ip_t                 *ck_ip;
+       librpz_ck_domain_t                 *ck_domain;
+       librpz_zone_refresh_t         *zone_refresh;
+       librpz_db_info_t                 *db_info;
+       librpz_itr_start_t                 *itr_start;
+       librpz_mf_stats_t                 *mf_stats;
+       librpz_vers_stats_t                 *vers_stats;
+       librpz_itr_zone_t                 *itr_zone;
+       librpz_itr_node_t                 *itr_node;
+       librpz_policy2str_t                 *policy2str;
+       librpz_trig2str_t                 *trig2str;
+       librpz_secs2str_t                 *secs2str;
+       librpz_str2secs_t                 *str2secs;
+       librpz_rtype2str_t                 *rtype2str;
+       librpz_domain_ntop_t         *domain_ntop;
+       librpz_domain_pton2_t         *domain_pton2;
+       librpz_mk_inet_su_t                 *mk_inet_su;
+       librpz_mk_inet6_su_t         *mk_inet6_su;
+       librpz_str2su_t                 *str2su;
+       librpz_su2str_t                 *su2str;
 } librpz_0_t;
 extern librpz_0_t librpz_def_0;
 
@@ -851,7 +851,7 @@ extern librpz_0_t librpz_def_0;
 #define LIBRPZ_DEF_STR "librpz_def_0"
 
 typedef librpz_0_t librpz_t;
-extern librpz_t *  librpz;
+extern librpz_t        *librpz;
 
 #if LIBRPZ_LIB_OPEN == 2
 #include <dlfcn.h>
@@ -865,7 +865,7 @@ extern librpz_t *  librpz;
  */
 static inline librpz_t *
 librpz_lib_open(librpz_emsg_t *emsg, void **dl_handle, const char *path) {
-       void *    handle;
+       void     *handle;
        librpz_t *new_librpz;
 
        emsg->c[0] = '\0';
index 0e80594cb370dc1f0f70e71eaf1e744c4b3f9d3e..abf8c34ecc67adada31ae678acbf09d66a36dfcd 100644 (file)
@@ -18,7 +18,7 @@
 #include <isc/lang.h>
 #include <isc/log.h>
 
-LIBDNS_EXTERNAL_DATA extern isc_log_t *              dns_lctx;
+LIBDNS_EXTERNAL_DATA extern isc_log_t        *dns_lctx;
 LIBDNS_EXTERNAL_DATA extern isc_logcategory_t dns_categories[];
 LIBDNS_EXTERNAL_DATA extern isc_logmodule_t   dns_modules[];
 
index 1ab7db3524866e3ad464439c909975ef6fa37c4b..618c1b1791c946a268a167ba37eb54cb4433f676 100644 (file)
@@ -57,11 +57,11 @@ ISC_LANG_BEGINDECLS
 typedef struct dns_lookupevent {
        ISC_EVENT_COMMON(struct dns_lookupevent);
        isc_result_t    result;
-       dns_name_t *    name;
+       dns_name_t         *name;
        dns_rdataset_t *rdataset;
        dns_rdataset_t *sigrdataset;
-       dns_db_t *      db;
-       dns_dbnode_t *  node;
+       dns_db_t         *db;
+       dns_dbnode_t   *node;
 } dns_lookupevent_t;
 
 isc_result_t
index dbb8ec8026648182f5a29c4ce603a8f840b81639..c7359cd79c0a0b7546d7b8e919eef4ec1c7c5797 100644 (file)
@@ -244,7 +244,7 @@ dns_dumpctx_db(dns_dumpctx_t *dctx);
 /*@{*/
 isc_result_t
 dns_master_dumptostreamasync(isc_mem_t *mctx, dns_db_t *db,
-                            dns_dbversion_t *         version,
+                            dns_dbversion_t         *version,
                             const dns_master_style_t *style, FILE *f,
                             isc_task_t *task, dns_dumpdonefunc_t done,
                             void *done_arg, dns_dumpctx_t **dctxp);
@@ -310,8 +310,8 @@ dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
 /*@}*/
 
 isc_result_t
-dns_master_rdatasettotext(const dns_name_t *       owner_name,
-                         dns_rdataset_t *          rdataset,
+dns_master_rdatasettotext(const dns_name_t        *owner_name,
+                         dns_rdataset_t                 *rdataset,
                          const dns_master_style_t *style, dns_indent_t *indent,
                          isc_buffer_t *target);
 /*%<
@@ -327,15 +327,15 @@ dns_master_rdatasettotext(const dns_name_t *          owner_name,
  */
 
 isc_result_t
-dns_master_questiontotext(const dns_name_t *       owner_name,
-                         dns_rdataset_t *          rdataset,
+dns_master_questiontotext(const dns_name_t        *owner_name,
+                         dns_rdataset_t                 *rdataset,
                          const dns_master_style_t *style,
-                         isc_buffer_t *            target);
+                         isc_buffer_t         *target);
 
 isc_result_t
 dns_master_dumpnodetostream(isc_mem_t *mctx, dns_db_t *db,
                            dns_dbversion_t *version, dns_dbnode_t *node,
-                           const dns_name_t *        name,
+                           const dns_name_t         *name,
                            const dns_master_style_t *style, FILE *f);
 
 isc_result_t
@@ -347,7 +347,7 @@ dns_masterstyle_flags_t
 dns_master_styleflags(const dns_master_style_t *style);
 
 isc_result_t
-dns_master_stylecreate(dns_master_style_t **   style,
+dns_master_stylecreate(dns_master_style_t        **style,
                       dns_masterstyle_flags_t flags, unsigned int ttl_column,
                       unsigned int class_column, unsigned int type_column,
                       unsigned int rdata_column, unsigned int line_length,
index fb114e70ab885af9d81ef7ec9723d801c9e99880..1f406e599aa62e9e5986ec0a35bf0c348bebf6ef 100644 (file)
@@ -194,8 +194,8 @@ typedef int dns_messagetextflag_t;
 typedef struct dns_msgblock dns_msgblock_t;
 
 struct dns_sortlist_arg {
-       dns_aclenv_t *          env;
-       const dns_acl_t *       acl;
+       dns_aclenv_t         *env;
+       const dns_acl_t *acl;
        const dns_aclelement_t *element;
 };
 
@@ -215,7 +215,7 @@ struct dns_message {
 
        /* private from here down */
        dns_namelist_t  sections[DNS_SECTION_MAX];
-       dns_name_t *    cursors[DNS_SECTION_MAX];
+       dns_name_t         *cursors[DNS_SECTION_MAX];
        dns_rdataset_t *opt;
        dns_rdataset_t *sig0;
        dns_rdataset_t *tsig;
@@ -241,10 +241,10 @@ struct dns_message {
        uint16_t     padding;
        unsigned int padding_off;
 
-       isc_buffer_t *  buffer;
+       isc_buffer_t   *buffer;
        dns_compress_t *cctx;
 
-       isc_mem_t *    mctx;
+       isc_mem_t         *mctx;
        isc_mempool_t *namepool;
        isc_mempool_t *rdspool;
 
@@ -263,14 +263,14 @@ struct dns_message {
        dns_name_t *tsigname; /* Owner name of TSIG, if any
                               * */
        dns_rdataset_t *querytsig;
-       dns_tsigkey_t tsigkey;
-       dst_context_t tsigctx;
+       dns_tsigkey_t  *tsigkey;
+       dst_context_t  *tsigctx;
        int             sigstart;
        int             timeadjust;
 
        dns_name_t *sig0name; /* Owner name of SIG0, if any
                               * */
-       dst_key_t *  sig0key;
+       dst_key_t         *sig0key;
        dns_rcode_t  sig0status;
        isc_region_t query;
        isc_region_t saved;
@@ -368,7 +368,7 @@ isc_result_t
 dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
                                const dns_master_style_t *style,
                                dns_messagetextflag_t     flags,
-                               isc_buffer_t *            target);
+                               isc_buffer_t         *target);
 /*%<
  * Convert section 'section' or 'pseudosection' of message 'msg' to
  * a cleartext representation
index 16bb5ffa33ae9be1dab8b3d5b703eb95d7d1a415..75bc0205a9d286811c1de5413c751aa1e6034c7b 100644 (file)
@@ -107,7 +107,7 @@ struct dns_name {
        unsigned int   labels;
        unsigned int   attributes;
        unsigned char *offsets;
-       isc_buffer_t buffer;
+       isc_buffer_t  *buffer;
        ISC_LINK(dns_name_t) link;
        ISC_LIST(dns_rdataset_t) list;
 };
@@ -1382,9 +1382,9 @@ ISC_LANG_ENDDECLS
 
 #define DNS_NAME_SPLIT(n, l, p, s)                                             \
        do {                                                                   \
-               dns_name_t _n = (n);                                         \
-               dns_name_t _p = (p);                                         \
-               dns_name_t _s = (s);                                         \
+               dns_name_t  *_n = (n);                                         \
+               dns_name_t  *_p = (p);                                         \
+               dns_name_t  *_s = (s);                                         \
                unsigned int _l = (l);                                         \
                if (_p != NULL)                                                \
                        dns_name_getlabelsequence(_n, 0, _n->labels - _l, _p); \
index 0cbcb51108dcd75baa9c09c90bfcd664ca3e56eb..bfcc81c05076cc9b3bd40a44ca384420f5410d3f 100644 (file)
@@ -107,7 +107,7 @@ dns_nsec3_supportedhash(dns_hash_t hash);
 
 isc_result_t
 dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version,
-                  const dns_name_t *            name,
+                  const dns_name_t                 *name,
                   const dns_rdata_nsec3param_t *nsec3param, dns_ttl_t nsecttl,
                   bool unsecure, dns_diff_t *diff);
 
@@ -154,7 +154,7 @@ dns_nsec3_addnsec3sx(dns_db_t *db, dns_dbversion_t *version,
 
 isc_result_t
 dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version,
-                  const dns_name_t *            name,
+                  const dns_name_t                 *name,
                   const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff);
 
 isc_result_t
@@ -164,7 +164,7 @@ dns_nsec3_delnsec3s(dns_db_t *db, dns_dbversion_t *version,
 isc_result_t
 dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version,
                     const dns_name_t *name, dns_rdatatype_t private,
-                    dns_diff_t *      diff);
+                    dns_diff_t *diff);
 /*%<
  * Remove NSEC3 records for 'name', recording the change in 'diff'.
  * Adjust previous NSEC3 records, if any, to reflect the removal.
index 4962650ef76b1ee7864c01c2318837c5da3cc679..fb25169bcb4cdaca6cdfd374679d8cb2df500a49 100644 (file)
@@ -45,11 +45,11 @@ ISC_LANG_BEGINDECLS
 struct dns_ntatable {
        /* Unlocked. */
        unsigned int    magic;
-       dns_view_t *    view;
+       dns_view_t         *view;
        isc_rwlock_t    rwlock;
-       isc_taskmgr_t taskmgr;
+       isc_taskmgr_t  *taskmgr;
        isc_timermgr_t *timermgr;
-       isc_task_t *    task;
+       isc_task_t         *task;
        /* Protected by atomics */
        isc_refcount_t references;
        /* Locked by rwlock. */
index 279ea8fd35a803ffa6a430a2fef4b9f2c9faddb8..013140d0b981fae9d03b1060567f83dda7a96a9c 100644 (file)
@@ -74,12 +74,12 @@ struct dns_peer {
        bool                  request_expire;
        bool                  force_tcp;
        bool                  tcp_keepalive;
-       dns_name_t *          key;
-       isc_sockaddr_t *      transfer_source;
+       dns_name_t         *key;
+       isc_sockaddr_t       *transfer_source;
        isc_dscp_t            transfer_dscp;
-       isc_sockaddr_t *      notify_source;
+       isc_sockaddr_t       *notify_source;
        isc_dscp_t            notify_dscp;
-       isc_sockaddr_t *      query_source;
+       isc_sockaddr_t       *query_source;
        isc_dscp_t            query_dscp;
        uint16_t              udpsize;     /* receive size */
        uint16_t              maxudp;      /* transmit size */
@@ -213,7 +213,7 @@ isc_result_t
 dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval);
 
 isc_result_t
-dns_peer_settransfersource(dns_peer_t *                 peer,
+dns_peer_settransfersource(dns_peer_t        *peer,
                           const isc_sockaddr_t *transfer_source);
 
 isc_result_t
index 367d72b9ff810b162c98204638ea6a12b822a38e..b67e60227aa0f2c655eff84b54e5df48f75c9355 100644 (file)
@@ -167,8 +167,8 @@ struct dns_rbtnode {
 };
 
 typedef isc_result_t (*dns_rbtfindcallback_t)(dns_rbtnode_t *node,
-                                             dns_name_t *   name,
-                                             void *         callback_arg);
+                                             dns_name_t         *name,
+                                             void         *callback_arg);
 
 typedef isc_result_t (*dns_rbtdatawriter_t)(FILE *file, unsigned char *data,
                                            void *arg, uint64_t *crc);
@@ -760,7 +760,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.
index 476ef5f9c70f96bf112962a996f9c031f2aa8465..2d706a86d7ef4e292068674ba6554ca51bde8392 100644 (file)
@@ -108,7 +108,7 @@ ISC_LANG_BEGINDECLS
  * purpose the client desires.
  */
 struct dns_rdata {
-       unsigned char *  data;
+       unsigned char   *data;
        unsigned int     length;
        dns_rdataclass_t rdclass;
        dns_rdatatype_t  type;
index 3266754d4cfb635dde865550863a5b25d85e5d6d..9dc9a8db6feabbb583b1859dafe90895f07ddc8d 100644 (file)
@@ -96,7 +96,7 @@ dns_rdatalist_tordataset(dns_rdatalist_t *rdatalist, dns_rdataset_t *rdataset);
  */
 
 isc_result_t
-dns_rdatalist_fromrdataset(dns_rdataset_t *  rdataset,
+dns_rdatalist_fromrdataset(dns_rdataset_t        *rdataset,
                           dns_rdatalist_t **rdatalist);
 /*%<
  * Point 'rdatalist' to the rdatalist in 'rdataset'.
index 2569e40d23a4622d72ea938a650f450d50e0b86a..f2585ef58433ba2e14e6e3ef8dbe256c42a86b2f 100644 (file)
@@ -68,11 +68,11 @@ typedef struct dns_rdatasetmethods {
        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,
+       isc_result_t (*addnoqname)(dns_rdataset_t         *rdataset,
                                   const dns_name_t *name);
        isc_result_t (*getnoqname)(dns_rdataset_t *rdataset, dns_name_t *name,
                                   dns_rdataset_t *neg, dns_rdataset_t *negsig);
-       isc_result_t (*addclosest)(dns_rdataset_t *  rdataset,
+       isc_result_t (*addclosest)(dns_rdataset_t         *rdataset,
                                   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);
@@ -81,7 +81,7 @@ typedef struct dns_rdatasetmethods {
        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,
+       isc_result_t (*addglue)(dns_rdataset_t  *rdataset,
                                dns_dbversion_t *version, dns_message_t *msg);
 } dns_rdatasetmethods_t;
 
@@ -135,13 +135,13 @@ struct dns_rdataset {
         * These are for use by the rdataset implementation, and MUST NOT
         * be changed by clients.
         */
-       void *       private1;
-       void *       private2;
-       void *       private3;
+       void         *private1;
+       void         *private2;
+       void         *private3;
        unsigned int privateuint4;
-       void *       private5;
-       const void private6;
-       const void private7;
+       void         *private5;
+       const void  *private6;
+       const void  *private7;
        /*@}*/
 };
 
@@ -398,7 +398,7 @@ dns_rdataset_towire(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
  */
 
 isc_result_t
-dns_rdataset_towiresorted(dns_rdataset_t *  rdataset,
+dns_rdataset_towiresorted(dns_rdataset_t        *rdataset,
                          const dns_name_t *owner_name, dns_compress_t *cctx,
                          isc_buffer_t *target, dns_rdatasetorderfunc_t order,
                          const void *order_arg, unsigned int options,
@@ -414,7 +414,7 @@ dns_rdataset_towiresorted(dns_rdataset_t *  rdataset,
  */
 
 isc_result_t
-dns_rdataset_towirepartial(dns_rdataset_t *  rdataset,
+dns_rdataset_towirepartial(dns_rdataset_t        *rdataset,
                           const dns_name_t *owner_name, dns_compress_t *cctx,
                           isc_buffer_t *target, dns_rdatasetorderfunc_t order,
                           const void *order_arg, unsigned int options,
@@ -438,7 +438,7 @@ dns_rdataset_towirepartial(dns_rdataset_t *  rdataset,
  */
 
 isc_result_t
-dns_rdataset_additionaldata(dns_rdataset_t *        rdataset,
+dns_rdataset_additionaldata(dns_rdataset_t        *rdataset,
                            dns_additionaldatafunc_t add, void *arg);
 /*%<
  * For each rdata in rdataset, call 'add' for each name and type in the
index adf0259fdc522dfa77b91593565694fb1e182b7b..8705dfc4c255d7749065f9857ff5f4336ce13f6f 100644 (file)
@@ -88,9 +88,9 @@ struct dns_rdatasetiter {
        /* Unlocked. */
        unsigned int               magic;
        dns_rdatasetitermethods_t *methods;
-       dns_db_t *                 db;
-       dns_dbnode_t *             node;
-       dns_dbversion_t *          version;
+       dns_db_t                         *db;
+       dns_dbnode_t                 *node;
+       dns_dbversion_t         *version;
        isc_stdtime_t              now;
 };
 
@@ -143,7 +143,7 @@ dns_rdatasetiter_next(dns_rdatasetiter_t *iterator);
 
 void
 dns_rdatasetiter_current(dns_rdatasetiter_t *iterator,
-                        dns_rdataset_t *    rdataset);
+                        dns_rdataset_t *rdataset);
 /*%<
  * Return the current rdataset.
  *
index 6661212930e72bbd039bb086b893e4dd5b74947d..8546c36a90239cd089ee3ddaf66c80fb60d0bd33 100644 (file)
@@ -67,13 +67,13 @@ ISC_LANG_BEGINDECLS
  */
 typedef struct dns_fetchevent {
        ISC_EVENT_COMMON(struct dns_fetchevent);
-       dns_fetch_t *         fetch;
+       dns_fetch_t         *fetch;
        isc_result_t          result;
        dns_rdatatype_t       qtype;
-       dns_db_t *            db;
-       dns_dbnode_t *        node;
-       dns_rdataset_t *      rdataset;
-       dns_rdataset_t *      sigrdataset;
+       dns_db_t                 *db;
+       dns_dbnode_t         *node;
+       dns_rdataset_t       *rdataset;
+       dns_rdataset_t       *sigrdataset;
        dns_fixedname_t       foundname;
        const isc_sockaddr_t *client;
        dns_messageid_t       id;
@@ -289,8 +289,8 @@ dns_resolver_detach(dns_resolver_t **resp);
 isc_result_t
 dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name,
                         dns_rdatatype_t type, const dns_name_t *domain,
-                        dns_rdataset_t *      nameservers,
-                        dns_forwarders_t *    forwarders,
+                        dns_rdataset_t *nameservers,
+                        dns_forwarders_t         *forwarders,
                         const isc_sockaddr_t *client, dns_messageid_t id,
                         unsigned int options, unsigned int depth,
                         isc_counter_t *qc, isc_task_t *task,
@@ -502,7 +502,7 @@ dns_resolver_disable_ds_digest(dns_resolver_t *resolver, const dns_name_t *name,
  */
 
 bool
-dns_resolver_algorithm_supported(dns_resolver_t *  resolver,
+dns_resolver_algorithm_supported(dns_resolver_t        *resolver,
                                 const dns_name_t *name, unsigned int alg);
 /*%<
  * Check if the given algorithm is supported by this resolver.
@@ -512,7 +512,7 @@ dns_resolver_algorithm_supported(dns_resolver_t *  resolver,
  */
 
 bool
-dns_resolver_ds_digest_supported(dns_resolver_t *  resolver,
+dns_resolver_ds_digest_supported(dns_resolver_t        *resolver,
                                 const dns_name_t *name,
                                 unsigned int      digest_type);
 /*%<
index 653bfd86d37ecf8a8e053bc8b2290a3c9c576666..5f646aca4583c0c9c7341d041ad19290c32ff588 100644 (file)
@@ -145,20 +145,20 @@ struct dns_rpz_zone {
 
        uint32_t min_update_interval;    /* minimal interval between
                                          * updates */
-       isc_ht_t *       nodes;          /* entries in zone */
+       isc_ht_t         *nodes;                 /* entries in zone */
        dns_rpz_zones_t *rpzs;           /* owner */
        isc_time_t       lastupdated;    /* last time the zone was processed
                                          * */
        bool updatepending;              /* there is an update
                                          * pending/waiting */
        bool             updaterunning;  /* there is an update running */
-       dns_db_t *       db;             /* zones database */
+       dns_db_t         *db;            /* zones database */
        dns_dbversion_t *dbversion;      /* version we will be updating to */
-       dns_db_t *       updb;           /* zones database we're working on */
+       dns_db_t         *updb;          /* zones database we're working on */
        dns_dbversion_t *updbversion;    /* version we're currently working
                                          * on */
        dns_dbiterator_t *updbit;        /* iterator to use when updating */
-       isc_ht_t *        newnodes;      /* entries in zone being updated */
+       isc_ht_t         *newnodes;      /* entries in zone being updated */
        bool              db_registered; /* is the notify event
                                          * registered? */
        bool         addsoa;             /* add soa to the additional section */
@@ -213,7 +213,7 @@ struct dns_rpz_popt {
  */
 struct dns_rpz_zones {
        dns_rpz_popt_t     p;
-       dns_rpz_zone_t *   zones[DNS_RPZ_MAX_ZONES];
+       dns_rpz_zone_t    *zones[DNS_RPZ_MAX_ZONES];
        dns_rpz_triggers_t triggers[DNS_RPZ_MAX_ZONES];
 
        /*
@@ -249,10 +249,10 @@ struct dns_rpz_zones {
         */
        dns_rpz_triggers_t total_triggers;
 
-       isc_mem_t *     mctx;
-       isc_taskmgr_t taskmgr;
+       isc_mem_t         *mctx;
+       isc_taskmgr_t  *taskmgr;
        isc_timermgr_t *timermgr;
-       isc_task_t *    updater;
+       isc_task_t         *updater;
        isc_refcount_t  refs;
        isc_refcount_t  irefs;
        /*
@@ -265,12 +265,12 @@ struct dns_rpz_zones {
        isc_mutex_t  maint_lock;
 
        dns_rpz_cidr_node_t *cidr;
-       dns_rbt_t *          rbt;
+       dns_rbt_t                 *rbt;
 
        /*
         * DNSRPZ librpz configuration string and handle on librpz connection
         */
-       char *                rps_cstr;
+       char                 *rps_cstr;
        size_t                rps_cstr_size;
        struct librpz_client *rps_client;
 };
@@ -293,23 +293,23 @@ typedef struct {
         */
        struct {
                dns_rpz_type_t   type;
-               dns_rpz_zone_t rpz;
+               dns_rpz_zone_t  *rpz;
                dns_rpz_prefix_t prefix;
                dns_rpz_policy_t policy;
                dns_ttl_t        ttl;
                isc_result_t     result;
-               dns_zone_t *     zone;
-               dns_db_t *       db;
+               dns_zone_t         *zone;
+               dns_db_t         *db;
                dns_dbversion_t *version;
-               dns_dbnode_t *   node;
-               dns_rdataset_t rdataset;
+               dns_dbnode_t    *node;
+               dns_rdataset_t  *rdataset;
        } m;
        /*
         * State for chasing IP addresses and NS names including recursion.
         */
        struct {
                unsigned int    label;
-               dns_db_t *      db;
+               dns_db_t         *db;
                dns_rdataset_t *ns_rdataset;
                dns_rdatatype_t r_type;
                isc_result_t    r_result;
@@ -323,9 +323,9 @@ typedef struct {
                isc_result_t    result;
                bool            is_zone;
                bool            authoritative;
-               dns_zone_t *    zone;
-               dns_db_t *      db;
-               dns_dbnode_t *  node;
+               dns_zone_t         *zone;
+               dns_db_t         *db;
+               dns_dbnode_t   *node;
                dns_rdataset_t *rdataset;
                dns_rdataset_t *sigrdataset;
                dns_rdatatype_t qtype;
@@ -351,9 +351,9 @@ typedef struct {
         * r_name: recursing for this name to possible policy triggers
         * f_name: saved found name from before recursion
         */
-       dns_name_t *    p_name;
-       dns_name_t *    r_name;
-       dns_name_t *    fname;
+       dns_name_t         *p_name;
+       dns_name_t         *r_name;
+       dns_name_t         *fname;
        dns_fixedname_t _p_namef;
        dns_fixedname_t _r_namef;
        dns_fixedname_t _fnamef;
index ad4b98dcaeb1917f25066526fc994fa5475a5dae..2adc67c56807718f08303ed35b5d7c59f52e2157 100644 (file)
@@ -54,11 +54,11 @@ ISC_LANG_BEGINDECLS
 typedef struct dns_rriterator {
        unsigned int        magic;
        isc_result_t        result;
-       dns_db_t *          db;
-       dns_dbiterator_t *  dbit;
-       dns_dbversion_t *   ver;
+       dns_db_t                 *db;
+       dns_dbiterator_t         *dbit;
+       dns_dbversion_t *ver;
        isc_stdtime_t       now;
-       dns_dbnode_t *      node;
+       dns_dbnode_t         *node;
        dns_fixedname_t     fixedname;
        dns_rdatasetiter_t *rdatasetit;
        dns_rdataset_t      rdataset;
index c1ebe44353a33880bf77b9773661533e4fa4ea5c..a98649801c0909cd6b5de55939efdb4f4a35a728 100644 (file)
@@ -197,7 +197,7 @@ struct dns_rrl_rate {
 typedef struct dns_rrl dns_rrl_t;
 struct dns_rrl {
        isc_mutex_t lock;
-       isc_mem_t mctx;
+       isc_mem_t  *mctx;
 
        bool           log_only;
        dns_rrl_rate_t responses_per_second;
index 1d4210d5dcc8758981f4b98f66d736d84768e9d2..7d972ff300b9229a3bc634d2eaf4f9ca1fb24c29 100644 (file)
@@ -52,14 +52,14 @@ typedef struct dns_sdblookup dns_sdblookup_t;
 typedef struct dns_sdballnodes dns_sdballnodes_t;
 
 typedef isc_result_t (*dns_sdblookupfunc_t)(const char *zone, const char *name,
-                                           void *                   dbdata,
-                                           dns_sdblookup_t *        lookup,
+                                           void                         *dbdata,
+                                           dns_sdblookup_t         *lookup,
                                            dns_clientinfomethods_t *methods,
                                            dns_clientinfo_t *clientinfo);
-typedef isc_result_t (*dns_sdblookup2func_t)(const dns_name_t *              zone,
-                                            const dns_name_t *       name,
-                                            void *                   dbdata,
-                                            dns_sdblookup_t *        lookup,
+typedef isc_result_t (*dns_sdblookup2func_t)(const dns_name_t        *zone,
+                                            const dns_name_t         *name,
+                                            void                         *dbdata,
+                                            dns_sdblookup_t         *lookup,
                                             dns_clientinfomethods_t *methods,
                                             dns_clientinfo_t *clientinfo);
 
index 115d5dc1d9ac005eec2362dab69838851c872503..f4278b3ede7a27dfee946305788f4552f7b3cb8a 100644 (file)
@@ -146,9 +146,9 @@ typedef void (*dns_sdlzdestroy_t)(void *driverarg, void *dbdata);
  */
 
 typedef isc_result_t (*dns_sdlzfindzone_t)(void *driverarg, void *dbdata,
-                                          const char *             name,
+                                          const char         *name,
                                           dns_clientinfomethods_t *methods,
-                                          dns_clientinfo_t *       clientinfo);
+                                          dns_clientinfo_t         *clientinfo);
 /*%<
  * Method prototype.  Drivers implementing the SDLZ interface MUST
  * supply a find zone method.  This method is called when the DNS
@@ -178,7 +178,7 @@ typedef isc_result_t (*dns_sdlzfindzone_t)(void *driverarg, void *dbdata,
 
 typedef isc_result_t (*dns_sdlzlookupfunc_t)(const char *zone, const char *name,
                                             void *driverarg, void *dbdata,
-                                            dns_sdlzlookup_t *       lookup,
+                                            dns_sdlzlookup_t         *lookup,
                                             dns_clientinfomethods_t *methods,
                                             dns_clientinfo_t *clientinfo);
 
@@ -221,7 +221,7 @@ typedef void (*dns_sdlzcloseversion_t)(const char *zone, bool commit,
  * If the call is successful then *versionp should be set to NULL
  */
 
-typedef isc_result_t (*dns_sdlzconfigure_t)(dns_view_t view,
+typedef isc_result_t (*dns_sdlzconfigure_t)(dns_view_t  *view,
                                            dns_dlzdb_t *dlzdb, void *driverarg,
                                            void *dbdata);
 /*%<
index 375df60c7a01e39be83ca81cd2e60f7dcebf0462..0cb49ea1b76fdea401617fc49a51dd04190e9c6d 100644 (file)
@@ -26,11 +26,11 @@ typedef struct dns_tcpmsg {
        uint16_t         size;
        isc_buffer_t     buffer;
        unsigned int     maxsize;
-       isc_mem_t *      mctx;
-       isc_socket_t *   sock;
-       isc_task_t *     task;
+       isc_mem_t         *mctx;
+       isc_socket_t    *sock;
+       isc_task_t         *task;
        isc_taskaction_t action;
-       void *           arg;
+       void         *arg;
        isc_event_t      event;
        /* public (read-only) */
        isc_result_t   result;
index 6170d3733872a5788db14cafc3af6b6d6e01d3b9..11d758ec4477ba6b3e5627d399445ceedf840be3 100644 (file)
@@ -34,11 +34,11 @@ ISC_LANG_BEGINDECLS
 #define DNS_TKEYMODE_DELETE          5
 
 struct dns_tkeyctx {
-       dst_key_t *       dhkey;
-       dns_name_t *      domain;
+       dst_key_t         *dhkey;
+       dns_name_t         *domain;
        dns_gss_cred_id_t gsscred;
-       isc_mem_t *       mctx;
-       char *            gssapi_keytab;
+       isc_mem_t         *mctx;
+       char         *gssapi_keytab;
 };
 
 isc_result_t
index 6b82b086f1e5cc2c94a99bcda3c2fdd5e8cc80a9..3a441e42ab88f0b1166c8f0bd0b72bd252cfcf56 100644 (file)
@@ -54,10 +54,10 @@ LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha512_name;
 #define DNS_TSIG_FUDGE 300
 
 struct dns_tsig_keyring {
-       dns_rbt_t *  keys;
+       dns_rbt_t         *keys;
        unsigned int writecount;
        isc_rwlock_t lock;
-       isc_mem_t *  mctx;
+       isc_mem_t         *mctx;
        /*
         * LRU list of generated key along with a count of the keys on the
         * list and a maximum size.
@@ -71,11 +71,11 @@ struct dns_tsig_keyring {
 struct dns_tsigkey {
        /* Unlocked */
        unsigned int        magic; /*%< Magic number. */
-       isc_mem_t *         mctx;
-       dst_key_t *         key;       /*%< Key */
+       isc_mem_t         *mctx;
+       dst_key_t         *key;       /*%< Key */
        dns_name_t          name;      /*%< Key name */
-       const dns_name_t *  algorithm; /*%< Algorithm name */
-       dns_name_t *        creator;   /*%< name that created secret */
+       const dns_name_t         *algorithm; /*%< Algorithm name */
+       dns_name_t         *creator;   /*%< name that created secret */
        bool                generated; /*%< was this generated? */
        isc_stdtime_t       inception; /*%< start of validity period */
        isc_stdtime_t       expire;    /*%< end of validity period */
index c20f444797d74b2dbf0142d30a5b666d2cc2f4d8..8781875651b1df11c8a534d07ebe7e7719c88f60 100644 (file)
@@ -162,7 +162,7 @@ typedef struct dns_ipkeylist dns_ipkeylist_t;
  */
 #ifndef GSSAPI
 typedef struct not_defined_gss_cred_id *gss_cred_id_t;
-typedef struct not_defined_gss_ctx *   gss_ctx_id_t;
+typedef struct not_defined_gss_ctx        *gss_ctx_id_t;
 #endif /* ifndef GSSAPI */
 typedef struct dst_gssapi_signverifyctx dst_gssapi_signverifyctx_t;
 
index 1c81efd3a274b6c25a32ac32fd59f7aeaf3d8df9..4744014598350b3889f9f879b515a0c8bd3f2ddb 100644 (file)
@@ -76,7 +76,7 @@ typedef struct dns_validatorevent {
        /*
         * Name and type of the response to be validated.
         */
-       dns_name_t *    name;
+       dns_name_t         *name;
        dns_rdatatype_t type;
        /*
         * Rdata and RRSIG (if any) for positive responses.
@@ -118,24 +118,24 @@ struct dns_validator {
        /* Unlocked. */
        unsigned int magic;
        isc_mutex_t  lock;
-       dns_view_t view;
+       dns_view_t  *view;
        /* Locked by lock. */
        unsigned int          options;
        unsigned int          attributes;
        dns_validatorevent_t *event;
-       dns_fetch_t *         fetch;
-       dns_validator_t *     subvalidator;
-       dns_validator_t *     parent;
-       dns_keytable_t *      keytable;
-       dst_key_t *           key;
-       dns_rdata_rrsig_t *   siginfo;
-       isc_task_t *          task;
+       dns_fetch_t         *fetch;
+       dns_validator_t *subvalidator;
+       dns_validator_t *parent;
+       dns_keytable_t       *keytable;
+       dst_key_t                 *key;
+       dns_rdata_rrsig_t         *siginfo;
+       isc_task_t         *task;
        isc_taskaction_t      action;
-       void *                arg;
+       void                 *arg;
        unsigned int          labels;
-       dns_rdataset_t *      currentset;
-       dns_rdataset_t *      keyset;
-       dns_rdataset_t *      dsset;
+       dns_rdataset_t       *currentset;
+       dns_rdataset_t       *keyset;
+       dns_rdataset_t       *dsset;
        dns_rdataset_t        fdsset;
        dns_rdataset_t        frdataset;
        dns_rdataset_t        fsigrdataset;
index 96703619bd42dda05475085c74cd0eb8069e38c2..2cf7eced16157b6efe6e41dd88f0bab168ff715d 100644 (file)
@@ -81,16 +81,16 @@ ISC_LANG_BEGINDECLS
 struct dns_view {
        /* Unlocked. */
        unsigned int      magic;
-       isc_mem_t *       mctx;
+       isc_mem_t         *mctx;
        dns_rdataclass_t  rdclass;
-       char *            name;
-       dns_zt_t *        zonetable;
-       dns_resolver_t *  resolver;
-       dns_adb_t *       adb;
+       char         *name;
+       dns_zt_t         *zonetable;
+       dns_resolver_t   *resolver;
+       dns_adb_t         *adb;
        dns_requestmgr_t *requestmgr;
-       dns_cache_t *     cache;
-       dns_db_t *        cachedb;
-       dns_db_t *        hints;
+       dns_cache_t         *cache;
+       dns_db_t         *cachedb;
+       dns_db_t         *hints;
 
        /*
         * security roots and negative trust anchors.
@@ -101,7 +101,7 @@ struct dns_view {
 
        isc_mutex_t  lock;
        bool         frozen;
-       isc_task_t task;
+       isc_task_t  *task;
        isc_event_t  resevent;
        isc_event_t  adbevent;
        isc_event_t  reqevent;
@@ -111,11 +111,11 @@ struct dns_view {
        bool         cacheshared;
 
        /* Configurable data. */
-       dns_tsig_keyring_t *  statickeys;
-       dns_tsig_keyring_t *  dynamickeys;
-       dns_peerlist_t *      peers;
-       dns_order_t *         order;
-       dns_fwdtable_t *      fwdtable;
+       dns_tsig_keyring_t   *statickeys;
+       dns_tsig_keyring_t   *dynamickeys;
+       dns_peerlist_t       *peers;
+       dns_order_t         *order;
+       dns_fwdtable_t       *fwdtable;
        bool                  recursion;
        bool                  qminimization;
        bool                  qmin_strict;
@@ -130,24 +130,24 @@ struct dns_view {
        bool                  trust_anchor_telemetry;
        bool                  root_key_sentinel;
        dns_transfer_format_t transfer_format;
-       dns_acl_t *           cacheacl;
-       dns_acl_t *           cacheonacl;
-       dns_acl_t *           queryacl;
-       dns_acl_t *           queryonacl;
-       dns_acl_t *           recursionacl;
-       dns_acl_t *           recursiononacl;
-       dns_acl_t *           sortlist;
-       dns_acl_t *           notifyacl;
-       dns_acl_t *           transferacl;
-       dns_acl_t *           updateacl;
-       dns_acl_t *           upfwdacl;
-       dns_acl_t *           denyansweracl;
-       dns_acl_t *           nocasecompress;
+       dns_acl_t                 *cacheacl;
+       dns_acl_t                 *cacheonacl;
+       dns_acl_t                 *queryacl;
+       dns_acl_t                 *queryonacl;
+       dns_acl_t                 *recursionacl;
+       dns_acl_t                 *recursiononacl;
+       dns_acl_t                 *sortlist;
+       dns_acl_t                 *notifyacl;
+       dns_acl_t                 *transferacl;
+       dns_acl_t                 *updateacl;
+       dns_acl_t                 *upfwdacl;
+       dns_acl_t                 *denyansweracl;
+       dns_acl_t                 *nocasecompress;
        bool                  msgcompression;
-       dns_rbt_t *           answeracl_exclude;
-       dns_rbt_t *           denyanswernames;
-       dns_rbt_t *           answernames_exclude;
-       dns_rrl_t *           rrl;
+       dns_rbt_t                 *answeracl_exclude;
+       dns_rbt_t                 *denyanswernames;
+       dns_rbt_t                 *answernames_exclude;
+       dns_rrl_t                 *rrl;
        bool                  provideixfr;
        bool                  requestnsid;
        bool                  sendcookie;
@@ -157,16 +157,16 @@ struct dns_view {
        dns_ttl_t             minncachettl;
        uint32_t              nta_lifetime;
        uint32_t              nta_recheck;
-       char *                nta_file;
+       char                 *nta_file;
        dns_ttl_t             prefetch_trigger;
        dns_ttl_t             prefetch_eligible;
        in_port_t             dstport;
        dns_aclenv_t          aclenv;
        dns_rdatatype_t       preferred_glue;
        bool                  flush;
-       dns_namelist_t *      delonly;
+       dns_namelist_t       *delonly;
        bool                  rootdelonly;
-       dns_namelist_t *      rootexclude;
+       dns_namelist_t       *rootexclude;
        bool                  checknames;
        uint16_t              maxudp;
        dns_ttl_t             staleanswerttl;
@@ -176,16 +176,16 @@ struct dns_view {
        uint32_t          staleanswerclienttimeout;
        uint16_t          nocookieudp;
        uint16_t          padding;
-       dns_acl_t *       pad_acl;
+       dns_acl_t         *pad_acl;
        unsigned int      maxbits;
        dns_dns64list_t   dns64;
        unsigned int      dns64cnt;
-       dns_rpz_zones_t * rpzs;
+       dns_rpz_zones_t *rpzs;
        dns_catz_zones_t *catzs;
        dns_dlzdblist_t   dlz_searched;
        dns_dlzdblist_t   dlz_unsearched;
        uint32_t          fail_ttl;
-       dns_badcache_t *  failcache;
+       dns_badcache_t   *failcache;
 
        /*
         * Configurable data for server use only,
@@ -218,19 +218,19 @@ 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;
+       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    *new_zone_config;
        void (*cfg_destroy)(void **);
        isc_mutex_t new_zone_lock;
 
        unsigned char secret[32]; /* Client secret */
        unsigned int  v6bias;
 
-       dns_dtenv_t *   dtenv;   /* Dnstap environment */
+       dns_dtenv_t    *dtenv;   /* Dnstap environment */
        dns_dtmsgtype_t dttypes; /* Dnstap message types
                                  * to log */
 
index ebe45fa2061ddc0a4c20b0524d8265e68d0f02b7..5a65569e4dde553e2b748328cf7d8e997ef82aa4 100644 (file)
@@ -9985,36 +9985,35 @@ rctx_done(respctx_t *rctx, isc_result_t result) {
                return;
        } else
 #endif /* ifdef ENABLE_AFL */
-               if (rctx->next_server)
-       {
-               rctx_nextserver(rctx, message, addrinfo, result);
-       } else if (rctx->resend) {
-               rctx_resend(rctx, addrinfo);
-       } else if (rctx->nextitem) {
-               rctx_next(rctx);
-       } else if (result == DNS_R_CHASEDSSERVERS) {
-               rctx_chaseds(rctx, message, addrinfo, result);
-       } else if (result == ISC_R_SUCCESS && !HAVE_ANSWER(fctx)) {
-               /*
-                * All has gone well so far, but we are waiting for the
-                * DNSSEC validator to validate the answer.
-                */
-               FCTXTRACE("wait for validator");
-               fctx_cancelqueries(fctx, true, false);
-               /*
-                * We must not retransmit while the validator is working;
-                * it has references to the current rmessage.
-                */
-               result = fctx_stopidletimer(fctx);
-               if (result != ISC_R_SUCCESS) {
+               if (rctx->next_server) {
+                       rctx_nextserver(rctx, message, addrinfo, result);
+               } else if (rctx->resend) {
+                       rctx_resend(rctx, addrinfo);
+               } else if (rctx->nextitem) {
+                       rctx_next(rctx);
+               } else if (result == DNS_R_CHASEDSSERVERS) {
+                       rctx_chaseds(rctx, message, addrinfo, result);
+               } else if (result == ISC_R_SUCCESS && !HAVE_ANSWER(fctx)) {
+                       /*
+                        * All has gone well so far, but we are waiting for the
+                        * DNSSEC validator to validate the answer.
+                        */
+                       FCTXTRACE("wait for validator");
+                       fctx_cancelqueries(fctx, true, false);
+                       /*
+                        * We must not retransmit while the validator is
+                        * working; it has references to the current rmessage.
+                        */
+                       result = fctx_stopidletimer(fctx);
+                       if (result != ISC_R_SUCCESS) {
+                               fctx_done(fctx, result, __LINE__);
+                       }
+               } else {
+                       /*
+                        * We're done.
+                        */
                        fctx_done(fctx, result, __LINE__);
                }
-       } else {
-               /*
-                * We're done.
-                */
-               fctx_done(fctx, result, __LINE__);
-       }
 
        dns_message_detach(&message);
 }
index 43037a9807c45860154e4a5bfafb954d08252f9c..d5cca4cfa4462d4987d74cf72ed1825acf03a5b8 100644 (file)
@@ -37,7 +37,7 @@
  * 'keydatabuf' members with the dst_key_fromdns() function.
  */
 typedef struct irs_dnsconf_dnskey {
-       dns_name_t *  keyname;
+       dns_name_t   *keyname;
        isc_buffer_t *keydatabuf;
        ISC_LINK(struct irs_dnsconf_dnskey) link;
 } irs_dnsconf_dnskey_t;
index a5779bd49103e1f03ccd8224b4d0ce56f560352f..bef691af4ec25099567decca0cf7c4c5890fe45c 100644 (file)
@@ -29,7 +29,7 @@ struct addrinfo {
        int ai_protocol;               /* 0 or IPPROTO_xxx for IPv4 and
                                        * IPv6 */
        size_t           ai_addrlen;   /* Length of ai_addr */
-       char *           ai_canonname; /* Canonical name for hostname */
+       char         *ai_canonname; /* Canonical name for hostname */
        struct sockaddr *ai_addr;      /* Binary address */
        struct addrinfo *ai_next;      /* Next structure in linked list */
 };
index 7776eddf75f10209d8aea26cf49a82f6dd730fa9..ffaed01dda255d1dcdfc9655e94e71a9f654559c 100644 (file)
@@ -43,7 +43,7 @@
  *** Types
  ***/
 struct isc_backtrace_symmap {
-       void *      addr;
+       void         *addr;
        const char *symbol;
 };
 
index 4072f14432958f5cbabd8d9c3f972744530987b7..f85fd9db906deb0a39dd8bac86e687d0eaaddbb6 100644 (file)
@@ -172,7 +172,7 @@ ISC_LANG_BEGINDECLS
 
 struct isc_buffer {
        unsigned int magic;
-       void *       base;
+       void         *base;
        /*@{*/
        /*! The following integers are byte offsets from 'base'. */
        unsigned int length;
@@ -1050,7 +1050,7 @@ ISC_LANG_ENDDECLS
 #define isc_buffer_constinit(_b, _d, _l)                    \
        do {                                                \
                union {                                     \
-                       void *      _var;                   \
+                       void         *_var;                   \
                        const void *_const;                 \
                } _deconst;                                 \
                _deconst._const = (_d);                     \
index a28afbbaa5e10d92579e937374597285eae419c7..494272194de1f01416e80083cd88e8cd08989896 100644 (file)
@@ -26,13 +26,13 @@ typedef void (*isc_eventdestructor_t)(isc_event_t *);
 #define ISC_EVENT_COMMON(ltype)               \
        size_t                ev_size;        \
        unsigned int          ev_attributes;  \
-       void *                ev_tag;         \
+       void                 *ev_tag;         \
        isc_eventtype_t       ev_type;        \
        isc_taskaction_t      ev_action;      \
-       void *                ev_arg;         \
-       void *                ev_sender;      \
+       void                 *ev_arg;         \
+       void                 *ev_sender;      \
        isc_eventdestructor_t ev_destroy;     \
-       void *                ev_destroy_arg; \
+       void                 *ev_destroy_arg; \
        ISC_LINK(ltype) ev_link;              \
        ISC_LINK(ltype) ev_ratelink
 
index 85376f84c99692e5cd51d98964a85dd90b03bff1..d37c91f1b6078d99d64c6ece70084ae4c4f3be86 100644 (file)
@@ -31,9 +31,9 @@
  * the data cleanup function.
  */
 struct isc_httpdurl {
-       char *             url;
+       char                 *url;
        isc_httpdaction_t *action;
-       void *             action_arg;
+       void                 *action_arg;
        bool               isstatic;
        isc_time_t         loadtime;
        ISC_LINK(isc_httpdurl_t) link;
@@ -50,7 +50,7 @@ struct isc_httpdurl {
  */
 isc_result_t
 isc_httpdmgr_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task,
-                   isc_httpdclientok_t * client_ok,
+                   isc_httpdclientok_t *client_ok,
                    isc_httpdondestroy_t *ondestory, void *cb_arg,
                    isc_timermgr_t *tmgr, isc_httpdmgr_t **httpdp);
 
index 84d4f42486044075063b3bef375b79affacbd983..b179d5052eec918ea4106c644a360309a788eeb7 100644 (file)
@@ -129,7 +129,7 @@ typedef union {
        unsigned long    as_ulong;
        isc_region_t     as_region;
        isc_textregion_t as_textregion;
-       void *           as_pointer;
+       void         *as_pointer;
 } isc_tokenvalue_t;
 
 typedef struct isc_token {
index 2a8555c104dd863b19168f78d25a5d86fb5a1b73..a37741d82a9527a9f15f8179a70e305b655c93e3 100644 (file)
@@ -42,7 +42,7 @@ struct isc_lfsr {
        uint32_t         tap;    /*%< bit taps */
        unsigned int     count;  /*%< reseed count (in BITS!) */
        isc_lfsrreseed_t reseed; /*%< reseed function */
-       void *           arg;    /*%< reseed function argument */
+       void         *arg;       /*%< reseed function argument */
 };
 
 ISC_LANG_BEGINDECLS
index 30bc57b1a9d059a0cdff3c6543dea40e6bfe9e45..b2728f3734d9dde6d9181ded982f8e479a6a4da3 100644 (file)
@@ -101,7 +101,7 @@ typedef enum {
  * isc_log_registercategories.
  */
 struct isc_logcategory {
-       const char name;
+       const char  *name;
        unsigned int id;
 };
 
@@ -109,7 +109,7 @@ struct isc_logcategory {
  * Similar to isc_logcategory, but for all the modules a library defines.
  */
 struct isc_logmodule {
-       const char name;
+       const char  *name;
        unsigned int id;
 };
 
@@ -160,7 +160,7 @@ typedef union isc_logdestination {
  * the order of the names.
  */
 LIBISC_EXTERNAL_DATA extern isc_logcategory_t isc_categories[];
-LIBISC_EXTERNAL_DATA extern isc_log_t *              isc_lctx;
+LIBISC_EXTERNAL_DATA extern isc_log_t        *isc_lctx;
 LIBISC_EXTERNAL_DATA extern isc_logmodule_t   isc_modules[];
 /*@}*/
 
@@ -442,7 +442,7 @@ isc_log_createchannel(isc_logconfig_t *lcfg, const char *name,
 isc_result_t
 isc_log_usechannel(isc_logconfig_t *lcfg, const char *name,
                   const isc_logcategory_t *category,
-                  const isc_logmodule_t *  module);
+                  const isc_logmodule_t         *module);
 /*%<
  * Associate a named logging channel with a category and module that
  * will use it.
index 3431006595be845415b0af40945465b3490741ff..7c8ad2221a73df187933798c3e101948816907f3 100644 (file)
@@ -47,7 +47,7 @@ typedef void (*isc_quota_cb_func_t)(isc_quota_t *quota, void *data);
 struct isc_quota_cb {
        int                 magic;
        isc_quota_cb_func_t cb_func;
-       void *              data;
+       void                 *data;
        ISC_LINK(isc_quota_cb_t) link;
 };
 
index 50cdf6be336ef663ad139d5790b7510c82507073..34ceb86d7e140d815eb5c15657531f350dca3051 100644 (file)
@@ -42,7 +42,7 @@
        } while (0)
 
 typedef struct isc_prefix {
-       isc_mem_t *  mctx;
+       isc_mem_t         *mctx;
        unsigned int family;   /* AF_INET | AF_INET6, or AF_UNSPEC for
                                * "any" */
        unsigned int   bitlen; /* 0 for "any" */
@@ -85,12 +85,12 @@ typedef void (*isc_radix_processfunc_t)(isc_prefix_t *, void **);
 #define ISC_RADIX_FAMILY(p) (((p)->family == AF_INET6) ? RADIX_V6 : RADIX_V4)
 
 typedef struct isc_radix_node {
-       isc_mem_t *            mctx;
+       isc_mem_t                 *mctx;
        uint32_t               bit;    /* bit length of the prefix */
-       isc_prefix_t *         prefix; /* who we are in radix tree */
+       isc_prefix_t         *prefix; /* who we are in radix tree */
        struct isc_radix_node *l, *r;  /* left and right children */
        struct isc_radix_node *parent; /* may be used */
-       void *                 data[RADIX_FAMILIES]; /* pointers to IPv4
+       void                 *data[RADIX_FAMILIES]; /* pointers to IPv4
                                                      * and IPV6 data */
        int node_num[RADIX_FAMILIES];                /* which node
                                                      * this was in
@@ -104,7 +104,7 @@ typedef struct isc_radix_node {
 
 typedef struct isc_radix_tree {
        unsigned int      magic;
-       isc_mem_t *       mctx;
+       isc_mem_t         *mctx;
        isc_radix_node_t *head;
        uint32_t          maxbits;         /* for IP, 32 bit addresses */
        int               num_active_node; /* for debugging purposes */
@@ -196,9 +196,9 @@ isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func);
 
 #define RADIX_WALK(Xhead, Xnode)                              \
        do {                                                  \
-               isc_radix_node_t Xstack[RADIX_MAXBITS + 1]; \
+               isc_radix_node_t         *Xstack[RADIX_MAXBITS + 1]; \
                isc_radix_node_t **Xsp = Xstack;              \
-               isc_radix_node_t Xrn = (Xhead);             \
+               isc_radix_node_t         *Xrn = (Xhead);             \
                while ((Xnode = Xrn)) {                       \
                        if (Xnode->prefix)
 
index b6c932f4e44c08d609c42f23865c923df10e16d0..ab09f14693e65a0d9618ccb99171e0cc7bd40b1c 100644 (file)
@@ -23,7 +23,7 @@ struct isc_region {
 };
 
 struct isc_textregion {
-       char *       base;
+       char         *base;
        unsigned int length;
 };
 
@@ -31,12 +31,12 @@ struct isc_textregion {
  * discussing the region api.
  */
 struct isc_constregion {
-       const void base;
+       const void  *base;
        unsigned int length;
 };
 
 struct isc_consttextregion {
-       const char base;
+       const char  *base;
        unsigned int length;
 };
 
index 61b853c990b0121788f03d5548414962721e9957..282c7aeb1a63a583d3196dc33607a5ed47871ad7 100644 (file)
@@ -133,7 +133,7 @@ struct isc_socketevent {
 typedef struct isc_socket_newconnev isc_socket_newconnev_t;
 struct isc_socket_newconnev {
        ISC_EVENT_COMMON(isc_socket_newconnev_t);
-       isc_socket_t newsocket;
+       isc_socket_t  *newsocket;
        isc_result_t   result;  /*%< OK, EOF, whatever else */
        isc_sockaddr_t address; /*%< source address */
 };
@@ -904,7 +904,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0);
 /*%<
  * See isc_socketmgr_create() above.
  */
-typedef isc_result_t (*isc_socketmgrcreatefunc_t)(isc_mem_t *      mctx,
+typedef isc_result_t (*isc_socketmgrcreatefunc_t)(isc_mem_t        *mctx,
                                                  isc_socketmgr_t **managerp);
 
 ISC_LANG_ENDDECLS
index ed85d798725f360b74d6744544676bff7ede516c..07000c6fed31c7643e3400498a66bfbff07d0cd5 100644 (file)
@@ -87,8 +87,8 @@
  ***/
 /*% Symbol table value. */
 typedef union isc_symvalue {
-       void *       as_pointer;
-       const void as_cpointer;
+       void         *as_pointer;
+       const void  *as_cpointer;
        int          as_integer;
        unsigned int as_uinteger;
 } isc_symvalue_t;
index 6a2e878a4fe7a1159bee0151102e7bbb5616720a..603bfbf9f77796a420cabc1f3617da2b5a683ae5 100644 (file)
@@ -78,7 +78,7 @@
        do {                           \
                union {                \
                        const void *k; \
-                       void *      v; \
+                       void         *v; \
                } _u;                  \
                _u.k = konst;          \
                var = _u.v;            \
index de95568545de4251e6b50ac27abcc7b0f02582c1..7f1cc8f3981158af55ed84b298faa87359e42bf1 100644 (file)
@@ -44,11 +44,11 @@ struct pk11_object {
        CK_BBOOL         ontoken;
        CK_BBOOL         reqlogon;
        CK_BYTE          attrcnt;
-       CK_ATTRIBUTE *   repr;
+       CK_ATTRIBUTE    *repr;
 };
 
 struct pk11_context {
-       void *            handle;
+       void         *handle;
        CK_SESSION_HANDLE session;
        CK_BBOOL          ontoken;
        CK_OBJECT_HANDLE  object;
index cd565ee64fddd86ca13461380db64b6cbf56bf11..2f0cc831cb22e205c03f64768b1a38fb18bc2fb0 100644 (file)
@@ -501,7 +501,7 @@ typedef unsigned long ck_attribute_type_t;
 
 struct ck_attribute {
        ck_attribute_type_t type;
-       void *              value;
+       void                 *value;
        unsigned long       value_len;
 };
 
@@ -886,7 +886,7 @@ typedef unsigned long ck_mechanism_type_t;
 
 struct ck_mechanism {
        ck_mechanism_type_t mechanism;
-       void *              parameter;
+       void                 *parameter;
        unsigned long       parameter_len;
 };
 
@@ -900,7 +900,7 @@ typedef unsigned long ck_param_type;
 
 typedef struct ck_otp_param {
        ck_param_type type;
-       void *        value;
+       void         *value;
        unsigned long value_len;
 } ck_otp_param;
 
@@ -934,7 +934,7 @@ struct ck_rsa_pkcs_oaep_params {
        ck_mechanism_type_t            hash_alg;
        ck_rsa_pkcs_mgf_type_t         mgf;
        ck_rsa_pkcs_oaep_source_type_t source;
-       void *                         source_data;
+       void                         *source_data;
        unsigned long                  source_data_len;
 };
 
@@ -1065,11 +1065,11 @@ _CK_DECLARE_FUNCTION(C_CloseAllSessions, (ck_slot_id_t slot_id));
 _CK_DECLARE_FUNCTION(C_GetSessionInfo, (ck_session_handle_t    session,
                                        struct ck_session_info *info));
 _CK_DECLARE_FUNCTION(C_GetOperationState, (ck_session_handle_t session,
-                                          unsigned char *     operation_state,
+                                          unsigned char         *operation_state,
                                           unsigned long *operation_state_len));
 _CK_DECLARE_FUNCTION(C_SetOperationState,
                     (ck_session_handle_t session,
-                     unsigned char *     operation_state,
+                     unsigned char         *operation_state,
                      unsigned long       operation_state_len,
                      ck_object_handle_t  encryption_key,
                      ck_object_handle_t  authentiation_key));
@@ -1117,19 +1117,19 @@ _CK_DECLARE_FUNCTION(C_EncryptUpdate,
                      unsigned long part_len, unsigned char *encrypted_part,
                      unsigned long *encrypted_part_len));
 _CK_DECLARE_FUNCTION(C_EncryptFinal, (ck_session_handle_t session,
-                                     unsigned char *     last_encrypted_part,
+                                     unsigned char         *last_encrypted_part,
                                      unsigned long *last_encrypted_part_len));
 
 _CK_DECLARE_FUNCTION(C_DecryptInit,
                     (ck_session_handle_t  session,
                      struct ck_mechanism *mechanism, ck_object_handle_t key));
 _CK_DECLARE_FUNCTION(C_Decrypt, (ck_session_handle_t session,
-                                unsigned char *     encrypted_data,
+                                unsigned char      *encrypted_data,
                                 unsigned long       encrypted_data_len,
                                 unsigned char *data, unsigned long *data_len));
 _CK_DECLARE_FUNCTION(C_DecryptUpdate,
                     (ck_session_handle_t session,
-                     unsigned char *     encrypted_part,
+                     unsigned char         *encrypted_part,
                      unsigned long encrypted_part_len, unsigned char *part,
                      unsigned long *part_len));
 _CK_DECLARE_FUNCTION(C_DecryptFinal,
@@ -1198,7 +1198,7 @@ _CK_DECLARE_FUNCTION(C_DigestEncryptUpdate,
                      unsigned long *encrypted_part_len));
 _CK_DECLARE_FUNCTION(C_DecryptDigestUpdate,
                     (ck_session_handle_t session,
-                     unsigned char *     encrypted_part,
+                     unsigned char         *encrypted_part,
                      unsigned long encrypted_part_len, unsigned char *part,
                      unsigned long *part_len));
 _CK_DECLARE_FUNCTION(C_SignEncryptUpdate,
@@ -1207,7 +1207,7 @@ _CK_DECLARE_FUNCTION(C_SignEncryptUpdate,
                      unsigned long *encrypted_part_len));
 _CK_DECLARE_FUNCTION(C_DecryptVerifyUpdate,
                     (ck_session_handle_t session,
-                     unsigned char *     encrypted_part,
+                     unsigned char         *encrypted_part,
                      unsigned long encrypted_part_len, unsigned char *part,
                      unsigned long *part_len));
 
@@ -1223,8 +1223,8 @@ _CK_DECLARE_FUNCTION(C_GenerateKeyPair,
                      unsigned long        public_key_attribute_count,
                      struct ck_attribute *private_key_template,
                      unsigned long        private_key_attribute_count,
-                     ck_object_handle_t public_key,
-                     ck_object_handle_t private_key));
+                     ck_object_handle_t         *public_key,
+                     ck_object_handle_t         *private_key));
 _CK_DECLARE_FUNCTION(C_WrapKey,
                     (ck_session_handle_t  session,
                      struct ck_mechanism *mechanism,
@@ -1337,7 +1337,7 @@ struct ck_c_initialize_args {
        ck_lockmutex_t    lock_mutex;
        ck_unlockmutex_t  unlock_mutex;
        ck_flags_t        flags;
-       void *            reserved;
+       void         *reserved;
 };
 
 #define CKF_LIBRARY_CANT_CREATE_OS_THREADS (1UL << 0)
@@ -1456,12 +1456,12 @@ typedef unsigned char     CK_UTF8CHAR;
 typedef unsigned char    CK_BBOOL;
 typedef unsigned long int CK_ULONG;
 typedef long int         CK_LONG;
-typedef CK_BYTE *        CK_BYTE_PTR;
-typedef CK_CHAR *        CK_CHAR_PTR;
-typedef CK_UTF8CHAR *    CK_UTF8CHAR_PTR;
-typedef CK_ULONG *       CK_ULONG_PTR;
-typedef void *           CK_VOID_PTR;
-typedef void **                  CK_VOID_PTR_PTR;
+typedef CK_BYTE                *CK_BYTE_PTR;
+typedef CK_CHAR                *CK_CHAR_PTR;
+typedef CK_UTF8CHAR        *CK_UTF8CHAR_PTR;
+typedef CK_ULONG        *CK_ULONG_PTR;
+typedef void        *CK_VOID_PTR;
+typedef void        **CK_VOID_PTR_PTR;
 #define CK_FALSE 0
 #define CK_TRUE         1
 #ifndef CK_DISABLE_TRUE_FALSE
@@ -1514,7 +1514,7 @@ typedef struct ck_otp_mechanism_info  CK_OTP_MECHANISM_INFO;
 typedef struct ck_otp_mechanism_info *CK_OTP_MECHANISM_INFO_PTR;
 
 typedef struct ck_function_list          CK_FUNCTION_LIST;
-typedef struct ck_function_list CK_FUNCTION_LIST_PTR;
+typedef struct ck_function_list        *CK_FUNCTION_LIST_PTR;
 typedef struct ck_function_list **CK_FUNCTION_LIST_PTR_PTR;
 
 typedef struct ck_c_initialize_args  CK_C_INITIALIZE_ARGS;
index 51bf96af3ac38f6ad0ff6e4e2d3ee13e6daf897b..cca3e5a5c4d0f04e52298e78413d1dd6e51f37e5 100644 (file)
@@ -33,8 +33,8 @@ 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 void     *isc_threadresult_t;
+typedef void     *isc_threadarg_t;
 typedef isc_threadresult_t (*isc_threadfunc_t)(isc_threadarg_t);
 
 void
index f42ebe695926f901203219bb3998fb138491bf04..1784349f36dcb457c4b07c90b9c2130b8af9b513 100644 (file)
@@ -33,7 +33,7 @@ typedef struct isc_dir {
        unsigned int   magic;
        char           dirname[PATH_MAX];
        isc_direntry_t entry;
-       DIR *          handle;
+       DIR         *handle;
 } isc_dir_t;
 
 ISC_LANG_BEGINDECLS
index b361b9f9daedada56de0bdbe3eeddf4bf86da97d..ec0c1fd833bdbd57bf428b4c2d61f34727ca5970 100644 (file)
@@ -66,7 +66,7 @@ WaitAbandonedIndex(DWORD dwWaitResult) {
 
 typedef HANDLE isc_thread_t;
 typedef DWORD  isc_threadresult_t;
-typedef void isc_threadarg_t;
+typedef void  *isc_threadarg_t;
 typedef isc_threadresult_t(WINAPI *isc_threadfunc_t)(isc_threadarg_t);
 
 #define isc_thread_self (uintptr_t) GetCurrentThreadId
index 77a78884dcbd840d53583ae27e4193470caf0144..24292ae7fe37349e3023df6a34c0694e29c310e5 100644 (file)
@@ -41,11 +41,11 @@ typedef struct isccc_ccmsg {
        uint32_t         size;
        isc_buffer_t     buffer;
        unsigned int     maxsize;
-       isc_mem_t *      mctx;
-       isc_socket_t *   sock;
-       isc_task_t *     task;
+       isc_mem_t         *mctx;
+       isc_socket_t    *sock;
+       isc_task_t         *task;
        isc_taskaction_t action;
-       void *           arg;
+       void         *arg;
        isc_event_t      event;
        /* public (read-only) */
        isc_result_t   result;
index d03572bb0576d229be67bcc495101d4e7d4c1164..e2fb4919ba991ac11d6ad09f52bc09cf7a1f666a 100644 (file)
@@ -47,7 +47,7 @@ struct isccc_dottedpair {
 struct isccc_sexpr {
        unsigned int type;
        union {
-               char *             as_string;
+               char                 *as_string;
                isccc_dottedpair_t as_dottedpair;
                isccc_region_t     as_region;
        } value;
index d93ce66bd245e7d1b42a2e225c35462f4f85aa93..dbe2985999a8e4544d95be6305d79eac72501baa 100644 (file)
  ***/
 
 typedef union isccc_symvalue {
-       void *       as_pointer;
+       void         *as_pointer;
        int          as_integer;
        unsigned int as_uinteger;
 } isccc_symvalue_t;
 
 typedef void (*isccc_symtabundefaction_t)(char *key, unsigned int type,
                                          isccc_symvalue_t value,
-                                         void *           userarg);
+                                         void         *userarg);
 
 typedef bool (*isccc_symtabforeachaction_t)(char *key, unsigned int type,
                                            isccc_symvalue_t value,
-                                           void *           userarg);
+                                           void                 *userarg);
 
 typedef enum {
        isccc_symexists_reject = 0,
index 2768522f62c2ea672482e2ce2b8a01242052cf47..b05e3ab772483a67a8160bece96bc7a5895e67df 100644 (file)
        do {                           \
                union {                \
                        const void *k; \
-                       void *      v; \
+                       void         *v; \
                } _u;                  \
                _u.k = konst;          \
                var = _u.v;            \
index 388ebe30fa524e7c7c087e5a369280df35cab1c6..09450f0ab3385ce2ec601aa9ac1b48ef99c01892 100644 (file)
@@ -70,7 +70,7 @@ typedef struct cfg_listelt cfg_listelt_t;
  * that needs to be interpreted at parsing time, like
  * "directory".
  */
-typedef isc_result_t (*cfg_parsecallback_t)(const char *     clausename,
+typedef isc_result_t (*cfg_parsecallback_t)(const char      *clausename,
                                            const cfg_obj_t *obj, void *arg);
 
 /***
@@ -579,9 +579,9 @@ cfg_map_nextclause(const cfg_type_t *map, const void **clauses,
 
 typedef isc_result_t(pluginlist_cb_t)(const cfg_obj_t *config,
                                      const cfg_obj_t *obj,
-                                     const char *     plugin_path,
-                                     const char *     parameters,
-                                     void *           callback_data);
+                                     const char         *plugin_path,
+                                     const char         *parameters,
+                                     void                 *callback_data);
 /*%<
  * Function prototype for the callback used with cfg_pluginlist_foreach().
  * Called once for each element of the list passed to cfg_pluginlist_foreach().
index 3abbf3d77b0090252ddb275d761305142eff1769..0938330a8955e4cff594ef6c04d1845fd4499d1e 100644 (file)
@@ -114,31 +114,31 @@ struct cfg_printer {
 
 /*% A clause definition. */
 struct cfg_clausedef {
-       const char name;
-       cfg_type_t type;
+       const char  *name;
+       cfg_type_t  *type;
        unsigned int flags;
 };
 
 /*% A tuple field definition. */
 struct cfg_tuplefielddef {
-       const char name;
-       cfg_type_t type;
+       const char  *name;
+       cfg_type_t  *type;
        unsigned int flags;
 };
 
 /*% A configuration object type definition. */
 struct cfg_type {
-       const char *    name; /*%< For debugging purposes only */
+       const char         *name; /*%< For debugging purposes only */
        cfg_parsefunc_t parse;
        cfg_printfunc_t print;
        cfg_docfunc_t   doc; /*%< Print grammar description */
-       cfg_rep_t *     rep; /*%< Data representation */
-       const void *    of;  /*%< Additional data for meta-types */
+       cfg_rep_t         *rep; /*%< Data representation */
+       const void         *of;  /*%< Additional data for meta-types */
 };
 
 /*% A keyword-type definition, for things like "port <integer>". */
 typedef struct {
-       const char *      name;
+       const char         *name;
        const cfg_type_t *type;
 } keyword_type_t;
 
@@ -181,7 +181,7 @@ struct cfg_duration {
  * A configuration data representation.
  */
 struct cfg_rep {
-       const char *   name; /*%< For debugging only */
+       const char         *name; /*%< For debugging only */
        cfg_freefunc_t free; /*%< How to free this kind of data. */
 };
 
@@ -199,7 +199,7 @@ struct cfg_obj {
                bool             boolean;
                cfg_map_t        map;
                cfg_list_t       list;
-               cfg_obj_t **     tuple;
+               cfg_obj_t         **tuple;
                isc_sockaddr_t   sockaddr;
                struct {
                        isc_sockaddr_t sockaddr;
@@ -209,9 +209,9 @@ struct cfg_obj {
                cfg_duration_t  duration;
        } value;
        isc_refcount_t references; /*%< reference counter */
-       const char *   file;
+       const char         *file;
        unsigned int   line;
-       cfg_parser_t pctx;
+       cfg_parser_t  *pctx;
 };
 
 /*% A list element. */
@@ -222,9 +222,9 @@ struct cfg_listelt {
 
 /*% The parser object. */
 struct cfg_parser {
-       isc_mem_t *  mctx;
-       isc_log_t *  lctx;
-       isc_lex_t *  lexer;
+       isc_mem_t         *mctx;
+       isc_log_t         *lctx;
+       isc_lex_t         *lexer;
        unsigned int errors;
        unsigned int warnings;
        isc_token_t  token;
@@ -278,7 +278,7 @@ struct cfg_parser {
        isc_refcount_t references;
 
        cfg_parsecallback_t callback;
-       void *              callbackarg;
+       void                 *callbackarg;
 };
 
 /* Parser context flags */
index 737d5e417da0d3b8c45fad64be968ee6d59da706..d43b967ebf53eea4e0385512a4beb7ffe536e18c 100644 (file)
@@ -144,11 +144,11 @@ struct ns_clientmgr {
        /* Unlocked. */
        unsigned int magic;
 
-       isc_mem_t *     mctx;
-       ns_server_t *   sctx;
-       isc_taskmgr_t taskmgr;
+       isc_mem_t         *mctx;
+       ns_server_t    *sctx;
+       isc_taskmgr_t  *taskmgr;
        isc_timermgr_t *timermgr;
-       isc_task_t *    excl;
+       isc_task_t         *excl;
        isc_refcount_t  references;
        int             ncpus;
 
@@ -172,43 +172,43 @@ struct ns_clientmgr {
 /*% nameserver client structure */
 struct ns_client {
        unsigned int     magic;
-       isc_mem_t *      mctx;
+       isc_mem_t         *mctx;
        bool             allocated; /* Do we need to free it? */
-       ns_server_t *    sctx;
-       ns_clientmgr_t manager;
+       ns_server_t         *sctx;
+       ns_clientmgr_t  *manager;
        ns_clientstate_t state;
        int              nupdates;
        bool             nodetach;
        bool             shuttingdown;
        unsigned int     attributes;
-       isc_task_t *     task;
-       dns_view_t *     view;
-       dns_dispatch_t dispatch;
-       isc_nmhandle_t handle;        /* Permanent pointer to handle */
-       isc_nmhandle_t sendhandle;    /* Waiting for send callback */
-       isc_nmhandle_t reqhandle;     /* Waiting for request callback
+       isc_task_t         *task;
+       dns_view_t         *view;
+       dns_dispatch_t  *dispatch;
+       isc_nmhandle_t  *handle;        /* Permanent pointer to handle */
+       isc_nmhandle_t  *sendhandle;    /* Waiting for send callback */
+       isc_nmhandle_t  *reqhandle;     /* Waiting for request callback
                                           (query, update, notify) */
        isc_nmhandle_t *fetchhandle;    /* Waiting for recursive fetch */
        isc_nmhandle_t *prefetchhandle; /* Waiting for prefetch / rpzfetch */
        isc_nmhandle_t *updatehandle;   /* Waiting for update callback */
-       unsigned char tcpbuf;
-       dns_message_t message;
-       unsigned char sendbuf;
+       unsigned char  *tcpbuf;
+       dns_message_t  *message;
+       unsigned char  *sendbuf;
        dns_rdataset_t *opt;
        uint16_t        udpsize;
        uint16_t        extflags;
        int16_t         ednsversion; /* -1 noedns */
        void (*cleanup)(ns_client_t *);
        void (*shutdown)(void *arg, isc_result_t result);
-       void *        shutdown_arg;
+       void         *shutdown_arg;
        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 */
+       dns_name_t   *signer;     /*%< NULL if not valid sig */
        bool          mortal;     /*%< Die after handling request */
-       isc_quota_t recursionquota;
+       isc_quota_t  *recursionquota;
 
        isc_sockaddr_t peeraddr;
        bool           peeraddr_valid;
index e8568f380d46cc767cfe548011e4eb41100b0efd..910718ecede2ecdecf707e63920e14b3f7c7cdd5 100644 (file)
@@ -234,9 +234,9 @@ typedef ns_hookresult_t (*ns_hook_action_t)(void *arg, void *data,
                                            isc_result_t *resultp);
 
 typedef struct ns_hook {
-       isc_mem_t *      mctx;
+       isc_mem_t         *mctx;
        ns_hook_action_t action;
-       void *           action_data;
+       void         *action_data;
        ISC_LINK(struct ns_hook) link;
 } ns_hook_t;
 
index 0a2092a249ca0d3f1d5bef8328a73f1a625577b4..d9ad59db2b4521cb574977d6a4778b4682f5a275 100644 (file)
@@ -75,9 +75,9 @@ struct ns_interface {
        isc_sockaddr_t     addr;       /*%< Address and port. */
        unsigned int       flags;      /*%< Interface flags */
        char               name[32];   /*%< Null terminated. */
-       dns_dispatch_t *   udpdispatch[MAX_UDP_DISPATCH];
+       dns_dispatch_t    *udpdispatch[MAX_UDP_DISPATCH];
        /*%< UDP dispatchers. */
-       isc_socket_t *  tcpsocket; /*%< TCP socket. */
+       isc_socket_t   *tcpsocket; /*%< TCP socket. */
        isc_nmsocket_t *udplistensocket;
        isc_nmsocket_t *tcplistensocket;
        isc_dscp_t      dscp;          /*%< "listen-on" DSCP value */
index 7dc37de0386d313ee9f3c538c8226b62b3c5fb62..f3f9b5fdf0b97bfb5a38c41ba9afc00bc9ad0471 100644 (file)
@@ -17,7 +17,7 @@
 #include <isc/log.h>
 #include <isc/types.h>
 
-LIBNS_EXTERNAL_DATA extern isc_log_t *      ns_lctx;
+LIBNS_EXTERNAL_DATA extern isc_log_t        *ns_lctx;
 LIBNS_EXTERNAL_DATA extern isc_logcategory_t ns_categories[];
 LIBNS_EXTERNAL_DATA extern isc_logmodule_t   ns_modules[];
 
index e0e83b997bfe002ffbbac4702ba077541c345888..4d48cf6b010e6548ce7c4185b9380e5fde3fbc13 100644 (file)
@@ -29,7 +29,7 @@
 
 /*% nameserver database version structure */
 typedef struct ns_dbversion {
-       dns_db_t *       db;
+       dns_db_t         *db;
        dns_dbversion_t *version;
        bool             acl_checked;
        bool             queryok;
@@ -42,9 +42,9 @@ typedef struct ns_dbversion {
  */
 typedef struct ns_query_recparam {
        dns_rdatatype_t qtype;
-       dns_name_t *    qname;
+       dns_name_t         *qname;
        dns_fixedname_t fqname;
-       dns_name_t *    qdomain;
+       dns_name_t         *qdomain;
        dns_fixedname_t fqdomain;
 } ns_query_recparam_t;
 
@@ -53,36 +53,36 @@ struct ns_query {
        unsigned int     attributes;
        unsigned int     restarts;
        bool             timerset;
-       dns_name_t *     qname;
-       dns_name_t *     origqname;
+       dns_name_t         *qname;
+       dns_name_t         *origqname;
        dns_rdatatype_t  qtype;
        unsigned int     dboptions;
        unsigned int     fetchoptions;
-       dns_db_t *       gluedb;
-       dns_db_t *       authdb;
-       dns_zone_t *     authzone;
+       dns_db_t         *gluedb;
+       dns_db_t         *authdb;
+       dns_zone_t         *authzone;
        bool             authdbset;
        bool             isreferral;
        isc_mutex_t      fetchlock;
-       dns_fetch_t *    fetch;
-       dns_fetch_t *    prefetch;
-       dns_rpz_st_t *   rpz_st;
+       dns_fetch_t         *fetch;
+       dns_fetch_t         *prefetch;
+       dns_rpz_st_t    *rpz_st;
        isc_bufferlist_t namebufs;
        ISC_LIST(ns_dbversion_t) activeversions;
        ISC_LIST(ns_dbversion_t) freeversions;
        dns_rdataset_t *dns64_aaaa;
        dns_rdataset_t *dns64_sigaaaa;
-       bool *          dns64_aaaaok;
+       bool         *dns64_aaaaok;
        unsigned int    dns64_aaaaoklen;
        unsigned int    dns64_options;
        unsigned int    dns64_ttl;
 
        struct {
-               dns_db_t *      db;
-               dns_zone_t *    zone;
-               dns_dbnode_t *  node;
+               dns_db_t         *db;
+               dns_zone_t         *zone;
+               dns_dbnode_t   *node;
                dns_rdatatype_t qtype;
-               dns_name_t *    fname;
+               dns_name_t         *fname;
                dns_fixedname_t fixed;
                isc_result_t    result;
                dns_rdataset_t *rdataset;
@@ -124,8 +124,8 @@ typedef struct query_ctx query_ctx_t;
 /* query context structure */
 struct query_ctx {
        isc_buffer_t *dbuf;          /* name buffer */
-       dns_name_t *  fname;         /* found name from DB lookup */
-       dns_name_t *  tname;         /* temporary name, used
+       dns_name_t   *fname;         /* found name from DB lookup */
+       dns_name_t   *tname;         /* temporary name, used
                                      * when processing ANY
                                      * queries */
        dns_rdataset_t *rdataset;    /* found rdataset */
@@ -157,19 +157,19 @@ struct query_ctx {
 
        dns_fetchevent_t *event; /* recursion event */
 
-       dns_db_t *       db;      /* zone or cache database */
+       dns_db_t         *db;     /* zone or cache database */
        dns_dbversion_t *version; /* DB version */
-       dns_dbnode_t *   node;    /* DB node */
+       dns_dbnode_t    *node;    /* DB node */
 
-       dns_db_t *       zdb;    /* zone DB values, saved */
-       dns_dbnode_t *   znode;  /* while searching cache */
-       dns_name_t *     zfname; /* for a better answer */
+       dns_db_t         *zdb;   /* zone DB values, saved */
+       dns_dbnode_t    *znode;  /* while searching cache */
+       dns_name_t         *zfname; /* for a better answer */
        dns_dbversion_t *zversion;
-       dns_rdataset_t zrdataset;
-       dns_rdataset_t zsigrdataset;
+       dns_rdataset_t  *zrdataset;
+       dns_rdataset_t  *zsigrdataset;
 
        dns_rpz_st_t *rpz_st; /* RPZ state */
-       dns_zone_t *  zone;   /* zone to search */
+       dns_zone_t   *zone;   /* zone to search */
 
        dns_view_t *view; /* client view */
 
index beaed2bca2225ad92e4b9dd0f8ab0d9ebe8e6f43..6a1f34562d63bf1b7642c6a079b62680df521a66 100644 (file)
@@ -70,7 +70,7 @@ typedef isc_result_t (*ns_matchview_t)(
  */
 struct ns_server {
        unsigned int magic;
-       isc_mem_t *  mctx;
+       isc_mem_t         *mctx;
 
        isc_refcount_t references;
 
@@ -88,15 +88,15 @@ struct ns_server {
        /*% Test options and other configurables */
        uint32_t options;
 
-       dns_acl_t *    blackholeacl;
-       dns_acl_t *    keepresporder;
+       dns_acl_t         *blackholeacl;
+       dns_acl_t         *keepresporder;
        uint16_t       udpsize;
        uint16_t       transfer_tcp_message_size;
        bool           interface_auto;
        dns_tkeyctx_t *tkeyctx;
 
        /*% Server id for NSID */
-       char *          server_id;
+       char         *server_id;
        ns_hostnamecb_t gethostname;
 
        /*% Fuzzer callback */
@@ -107,7 +107,7 @@ struct ns_server {
        ns_matchview_t matchingview;
 
        /*% Stats counters */
-       ns_stats_t nsstats;
+       ns_stats_t  *nsstats;
        dns_stats_t *rcvquerystats;
        dns_stats_t *opcodestats;
        dns_stats_t *rcodestats;
index ca4302f671599ecb4539b940bf1377ee40e523d4..f60a88ba5eb77dc6456a3d57d32d383599e73868 100644 (file)
@@ -23,7 +23,7 @@
  * Type for callback functions that rank addresses.
  */
 typedef int (*dns_addressorderfunc_t)(const isc_netaddr_t *address,
-                                     const void *         arg);
+                                     const void                 *arg);
 
 /*%
  * Return value type for setup_sortlist.
@@ -68,7 +68,7 @@ ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg);
 
 void
 ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, dns_aclenv_t *env,
-                       isc_netaddr_t *         client_addr,
+                       isc_netaddr_t         *client_addr,
                        dns_addressorderfunc_t *orderp, const void **argp);
 /*%<
  * Find the sortlist statement in 'acl' that applies to 'clientaddr', if any.