]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Update clang to version 14
authorMichal Nowak <mnowak@isc.org>
Tue, 31 May 2022 14:55:01 +0000 (16:55 +0200)
committerMichal Nowak <mnowak@isc.org>
Thu, 16 Jun 2022 16:11:03 +0000 (18:11 +0200)
(cherry picked from commit 1c45a9885afd325ec9de81820553398597506299)

78 files changed:
.gitlab-ci.yml
bin/dig/include/dig/dig.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/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/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/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/tests/private_test.c
lib/irs/win32/include/irs/netdb.h
lib/isc/include/isc/backtrace.h
lib/isc/include/isc/buffer.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/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 ea52a742339275accee8770e2f29982e6061c66e..9d5cdcae086e675d376562af2aea01d9268be88c 100644 (file)
@@ -16,16 +16,16 @@ variables:
   TEST_PARALLEL_JOBS: 6
 
   CONFIGURE: ./configure
-  CLANG: clang-13
-  SCAN_BUILD: scan-build-13
-  ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-13/bin/llvm-symbolizer
-  CLANG_FORMAT: clang-format-13
+  CLANG: clang-14
+  SCAN_BUILD: scan-build-14
+  ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-14/bin/llvm-symbolizer
+  CLANG_FORMAT: clang-format-14
 
   CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra
 
   # Pass run-time flags to AddressSanitizer to get core dumps on error.
   ASAN_OPTIONS: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
-  TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-12/bin/llvm-symbolizer"
+  TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer"
 
   TARBALL_COMPRESSOR: xz
   TARBALL_EXTENSION: xz
index 9683e398925df5d6caed61363f244b98d4295e5c..8bf9613db3867c63b1973d81fafdd0e7a34f0c75 100644 (file)
@@ -129,18 +129,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;
@@ -149,13 +149,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;
@@ -218,7 +218,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;
@@ -229,10 +229,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;
@@ -340,7 +340,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 d57f40f71186461987d8d718c749db7af10fba28..80f839dcac4e817b537aa6fb3e89505695dfd5b6 100644 (file)
@@ -48,7 +48,7 @@
  */
 struct named_server {
        unsigned int magic;
-       isc_mem_t         *mctx;
+       isc_mem_t   *mctx;
 
        ns_server_t *sctx;
 
@@ -69,12 +69,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;
@@ -96,15 +96,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 d8ae70a1715cd2642509e329ea695e411fe2cc92..1ddf3b97e317d4c172a2fa431d7fcb0526014be0 100644 (file)
@@ -36,7 +36,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;
@@ -61,7 +61,7 @@ struct dbinstance {
        char         *zone;
        char         *record;
        char         *client;
-       isc_mem_t         *mctx;
+       isc_mem_t    *mctx;
        isc_mutex_t   instance_lock;
        ISC_LINK(dbinstance_t) link;
 };
index 8d676d0e6312fefe487da6b00bc14fb68d1af666..8080570a71ed89dc689bde3b0861cb3516e5838e 100644 (file)
@@ -48,7 +48,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;
index e1f5c8ff423d983e5963956639b433ffe859f071..b6fa61156645c14f42db013d8818a34cb06125a7 100644 (file)
@@ -83,7 +83,7 @@ typedef uint32_t     dns_ttl_t;
        do {                           \
                union {                \
                        const void *k; \
-                       void         *v; \
+                       void       *v; \
                } _u;                  \
                _u.k = konst;          \
                var = _u.v;            \
@@ -128,7 +128,7 @@ typedef struct isc_sockaddr {
 #endif /* ifdef ISC_PLATFORM_HAVESYSUNH */
        } type;
        unsigned int length;
-       void         *link;
+       void        *link;
 } isc_sockaddr_t;
 
 typedef struct isc_netaddr {
@@ -152,16 +152,16 @@ typedef struct dns_ecs {
 #define DNS_CLIENTINFO_VERSION 3
 typedef struct dns_clientinfo {
        uint16_t  version;
-       void     *data;
-       void     *dbversion;
+       void     *data;
+       void     *dbversion;
        dns_ecs_t ecs;
 } 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 edb605e6168a156e040b90a59ceb6b4bf758c3b9..43fe15b9ba6b0bc2f0a7e74fc752d2a8a33772c4 100644 (file)
@@ -77,14 +77,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 c0b8f0f22bd9be64d268838a6a7460ac2908e08b..4e05fd6f8380d7476d12e69a6be5245a1ecea444 100644 (file)
@@ -120,7 +120,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 33cc712524aa4319e816e08780f10aa20b57b28d..4d719159c7be6cd8915a2871de5e9788402df992 100644 (file)
@@ -53,7 +53,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 b288684b8ba4b1b44637ea762613b1c64bbd7f43..750282928b1196a3370ebd67dc66724a1eb29153 100644 (file)
@@ -324,14 +324,14 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
 /* 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_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 a1241a2739b1be9326e505e48d30246a7eaaca7a..3928d2111208fcee9bb2e899828fd0b20946e1b2 100644 (file)
@@ -58,13 +58,13 @@ ISC_LANG_BEGINDECLS
  */
 typedef struct dns_clientinfo {
        uint16_t  version;
-       void     *data;
-       void     *dbversion;
+       void     *data;
+       void     *dbversion;
        dns_ecs_t ecs;
 } 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
index 80ef92ba16865429b0f4495d0907a1019bc93b72..f14d9f6c5294d7fe8648aa8609b63f7f433e11f5 100644 (file)
@@ -73,13 +73,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);
@@ -98,7 +98,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,
@@ -116,7 +116,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,
@@ -126,9 +126,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,
@@ -141,12 +141,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,
@@ -162,16 +162,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,
@@ -186,7 +186,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,
@@ -214,7 +214,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;
 };
 
@@ -223,7 +223,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 9f0f062d2e4123c9c5bcf49251c695fc80557a0a..32f204a8b3a453871890ec8ad0287cf5fcd86d37 100644 (file)
@@ -98,7 +98,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 4e3cf9f464cef99144050010ab79aeb57534bd92..48e1b2e647d21b76658cdc2278a74502a6bbd58a 100644 (file)
@@ -75,7 +75,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;
@@ -96,7 +96,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 4228608651d84af3c623040b2e611616888f1ce7..6061843e4c0abd1ca916f8661c2fc2ce45793089 100644 (file)
@@ -91,7 +91,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;
@@ -200,7 +200,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.
  *
@@ -414,7 +414,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 ff09ce8dd4e62e7adaee836766fb3787ef9b5d4b..962db29b5a3a23362c7e33c26331ba1517d1bbb2 100644 (file)
@@ -99,11 +99,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
@@ -137,12 +137,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
@@ -178,8 +178,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);
@@ -201,10 +201,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;
 };
 
@@ -214,12 +214,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 62794822c0e399e4e257e70a6f4ebb42361ad46e..058a23e2f7ca7e53ab4af8c6cd94ee0a620fb783 100644 (file)
@@ -58,7 +58,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 141499c16f080a346419794ee110af00c87cd50b..aa903b8fbec895049349e813e774f49b54f20724 100644 (file)
@@ -51,9 +51,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 bda744a8d9ecbe438fe7907ca217a008b3afeb89..cc2820a0e6c0627a1a2333ae19648c84ab0654b4 100644 (file)
@@ -35,12 +35,12 @@ ISC_LANG_BEGINDECLS
  */
 struct dns_dyndbctx {
        unsigned int    magic;
-       const void         *hashinit;
-       isc_mem_t         *mctx;
-       isc_log_t         *lctx;
-       dns_view_t         *view;
+       const void     *hashinit;
+       isc_mem_t      *mctx;
+       isc_log_t      *lctx;
+       dns_view_t     *view;
        dns_zonemgr_t  *zmgr;
-       isc_task_t         *task;
+       isc_task_t     *task;
        isc_timermgr_t *timermgr;
        unsigned int   *memdebug;
 };
index 65e01f0dfc88b15987333adf01ccf622fc4af268..721c2978f5e9a86705bdd7f778facfd3e71bad47 100644 (file)
@@ -81,7 +81,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;
@@ -105,7 +105,7 @@ ISC_LANG_BEGINDECLS
 bool
 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 1537023fc4a5bbce9ffedc1c1abe08c4235e46d9..b3dbfb69421176826a483b4afff5284e9132da11 100644 (file)
@@ -26,9 +26,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 9c959205ae5239e169c5c58864dbcf9ed0c9204d..83ecf049022b65827ccdf610b735ffb70a5a3478 100644 (file)
@@ -25,7 +25,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 6d48ad409ca080fef80dc463ab132b4bd87a4b11..48d773a0c63ead930e853da5cf11783ecf59ea39 100644 (file)
@@ -62,8 +62,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 eb53cf7b2eff25db4cc1b0a10f9377cab3bb4efc..110b798ec7a766f21faa9eddae4b258cd84c801b 100644 (file)
@@ -396,9 +396,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)
 
@@ -495,9 +495,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)
 
 /**
@@ -510,9 +510,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)
 
 /**
@@ -768,7 +768,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)
@@ -791,57 +791,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;
+       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_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_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_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_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_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_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;
 
@@ -853,7 +853,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>
@@ -867,7 +867,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 31ade77bd1ec20a6a3dc6ee0983787f765c3dea2..d78dda6195c1a47ad29379906926c43318d2e643 100644 (file)
@@ -20,7 +20,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 ce6bb4f1ceee9c7b48a81cd18a11e93f9eb4b7ca..2d1ce1315dc31da58ac287a225f00705ea0f350d 100644 (file)
@@ -59,10 +59,10 @@ 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_db_t       *db;
        dns_dbnode_t   *node;
 } dns_lookupevent_t;
 
index e9800d08d83a8190aff011553ffe900e06fef123..917e31f95d423552b590284bc3bafeed212a1140 100644 (file)
@@ -246,7 +246,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);
@@ -313,7 +313,7 @@ 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_rdataset_t           *rdataset,
                          const dns_master_style_t *style, dns_indent_t *indent,
                          isc_buffer_t *target);
 /*%<
@@ -330,9 +330,9 @@ 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_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,
@@ -349,7 +349,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 f4da972b1f83924ef892e828fd519821dce8dc6b..82140214835543fa5faece99f25c8c9ed53cae07 100644 (file)
@@ -196,8 +196,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;
 };
 
@@ -217,7 +217,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;
@@ -246,7 +246,7 @@ struct dns_message {
        isc_buffer_t   *buffer;
        dns_compress_t *cctx;
 
-       isc_mem_t         *mctx;
+       isc_mem_t     *mctx;
        isc_mempool_t *namepool;
        isc_mempool_t *rdspool;
 
@@ -272,7 +272,7 @@ struct dns_message {
 
        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;
@@ -370,7 +370,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 a1c407fd7dc4317deb0a5bb17c0774918b7725e3..3f20816ac9f1ffa096104583ee9e1aa30afc2c4e 100644 (file)
@@ -109,7 +109,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);
 
@@ -156,7 +156,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
@@ -166,7 +166,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 a03f3f40b3d05f78bb3e8ea4b092d77c832dcb93..905bf642a7c54e674147ff1d30fa78565c97b9bd 100644 (file)
@@ -47,11 +47,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_timermgr_t *timermgr;
-       isc_task_t         *task;
+       isc_task_t     *task;
        /* Protected by atomics */
        isc_refcount_t references;
        /* Locked by rwlock. */
index 38a22b41fd57886e78ba2c3eda9af74ec4cd306e..5f9a4dee4b0abe8d833b77f29cfa6c20fe289742 100644 (file)
@@ -76,12 +76,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 */
@@ -215,7 +215,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 5d78df71097bc9accc7e7eeb918a5df1a0762bbb..4a6b0781c78d9bdcb1637be0e7d611a0e025d8ae 100644 (file)
@@ -169,8 +169,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);
@@ -762,7 +762,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize,
 
 void
 dns_rbt_printtext(dns_rbt_t *rbt, void (*data_printer)(FILE *, void *),
-                 FILE      *f);
+                 FILE      *f);
 /*%<
  * Print an ASCII representation of the internal structure of the red-black
  * tree of trees to the passed stream.
index 288d0aa8e10f876587c7a5657131af121b148b54..2118dc404dc23f83cce953a908eae6a4684b1711 100644 (file)
@@ -110,7 +110,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 96a524e43ec1054565f7dd85254f4b41adc34dc4..3d490649a0c1ab561205353a36c91e988fde70e2 100644 (file)
@@ -98,7 +98,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 bdebec751dd7ee9e8ca9a86bdfc81b7ecdf80f55..ac2329fb7d978e814d9d90b84e4a84cf316d0b37 100644 (file)
@@ -70,11 +70,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);
@@ -83,7 +83,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;
 
@@ -137,11 +137,11 @@ 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;
+       void        *private5;
        const void  *private6;
        const void  *private7;
        /*@}*/
@@ -400,7 +400,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,
@@ -416,7 +416,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,
@@ -440,7 +440,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 69c425319c48eb1a682869c8e4f756ddf1610c3c..0ad1e407cb64abd857129114e017adf8bf034edb 100644 (file)
@@ -90,9 +90,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;
 };
 
@@ -145,7 +145,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 9feed3842c6f4272244c603eba995c8930a51d13..22ad9df45102b96c31448b01b34865b5a2057c03 100644 (file)
@@ -69,13 +69,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_db_t             *db;
        dns_dbnode_t         *node;
-       dns_rdataset_t       *rdataset;
-       dns_rdataset_t       *sigrdataset;
+       dns_rdataset_t       *rdataset;
+       dns_rdataset_t       *sigrdataset;
        dns_fixedname_t       foundname;
        const isc_sockaddr_t *client;
        dns_messageid_t       id;
@@ -291,8 +291,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,
@@ -504,7 +504,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.
@@ -514,7 +514,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 dfc5a12e5c2960f142c5d1830d13a382d0a49f34..f0cc57838a7bab4b072f3c597db89bbb3e71c9f6 100644 (file)
@@ -147,16 +147,16 @@ 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 */
@@ -215,7 +215,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];
 
        /*
@@ -251,10 +251,10 @@ struct dns_rpz_zones {
         */
        dns_rpz_triggers_t total_triggers;
 
-       isc_mem_t         *mctx;
+       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;
        /*
@@ -267,7 +267,7 @@ 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
@@ -295,23 +295,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;
@@ -325,8 +325,8 @@ typedef struct {
                isc_result_t    result;
                bool            is_zone;
                bool            authoritative;
-               dns_zone_t         *zone;
-               dns_db_t         *db;
+               dns_zone_t     *zone;
+               dns_db_t       *db;
                dns_dbnode_t   *node;
                dns_rdataset_t *rdataset;
                dns_rdataset_t *sigrdataset;
@@ -353,9 +353,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 5c78c8f51a5a88699560bdd2913c0e4544d7330b..2294d694ef27c2c6ecfccd09b5b95e9970b401c5 100644 (file)
@@ -56,11 +56,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 dcc7ca2be8e982c5aa6a977717564ebbe1493451..578d7cc23640480e3c5917c7de23acccd2681235 100644 (file)
@@ -54,13 +54,13 @@ 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,
+                                           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,
+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 9f433eaefb5f727bf4aaae5c395313941f95b4fb..6a06c98d6b966a02a07daa288432fe447e641a97 100644 (file)
@@ -148,9 +148,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
@@ -180,7 +180,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);
 
@@ -223,7 +223,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 c2d6439f5ec9112df713f0ceefdc8a91248f73fa..df98cd7bed1ff0cd8580a539a1feedcb4454799e 100644 (file)
@@ -28,11 +28,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 313834be28f2ec6ddd3d1dede70814ae130fb7bf..23d95ae54f3ba94e0f2c95ed9e05b7e6992d2810 100644 (file)
@@ -36,11 +36,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 93b825569c1aa07ef6d9054171e5b245d888f789..c908fa1ec24a73e4940a1d667cd91dcc4c116b59 100644 (file)
@@ -56,10 +56,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.
@@ -73,10 +73,10 @@ 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 */
+       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 */
index 4745ac3f88019b2a1e0abdf5aa48101468321676..641d81fbb2b28b5371d5fdfd8689cbab3c913757 100644 (file)
@@ -164,7 +164,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 8d4a14f253efe267905f346cbf578ff5ce0cf6f9..b435cd67fba73356a30c60b8f1dbcc782745475a 100644 (file)
@@ -78,7 +78,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.
@@ -125,19 +125,19 @@ struct dns_validator {
        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;
        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 171bcfefa6a7f553945c6a736f2ee4c8eb0f0fb8..a06110b700f3fd53b7371b58dc1cd2377ed1396c 100644 (file)
@@ -83,14 +83,14 @@ ISC_LANG_BEGINDECLS
 struct dns_view {
        /* Unlocked. */
        unsigned int      magic;
-       isc_mem_t         *mctx;
+       isc_mem_t        *mctx;
        dns_rdataclass_t  rdclass;
-       char         *name;
+       char             *name;
        dns_zt_t         *zonetable;
-       dns_resolver_t   *resolver;
-       dns_adb_t         *adb;
+       dns_resolver_t   *resolver;
+       dns_adb_t        *adb;
        dns_requestmgr_t *requestmgr;
-       dns_cache_t         *cache;
+       dns_cache_t      *cache;
        dns_db_t         *cachedb;
        dns_db_t         *hints;
 
@@ -115,9 +115,9 @@ struct dns_view {
        /* 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_peerlist_t       *peers;
+       dns_order_t          *order;
+       dns_fwdtable_t       *fwdtable;
        bool                  recursion;
        bool                  qminimization;
        bool                  qmin_strict;
@@ -132,24 +132,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;
@@ -166,9 +166,9 @@ struct dns_view {
        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;
@@ -178,16 +178,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,
@@ -220,12 +220,12 @@ 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;
 
index 1938e143abcc200740d0e784ba545ba700820c21..92ee3919523f10640ea12546b1c10f7325f0f472 100644 (file)
@@ -87,14 +87,10 @@ make_signing(signing_testcase_t *testcase, dns_rdata_t *private,
        buf[2] = (testcase->keyid & 0xff);
        buf[3] = testcase->remove;
        buf[4] = testcase->complete;
-      private
-       ->data = buf;
-      private
-       ->length = len;
-      private
-       ->type = privatetype;
-      private
-       ->rdclass = dns_rdataclass_in;
+       private->data = buf;
+       private->length = len;
+       private->type = privatetype;
+       private->rdclass = dns_rdataclass_in;
 }
 
 static void
index 801f96f54739fd94e9f9ca4253ecca41da178309..3e3e5d3d6fcb267b3b714806fa3ac7f89b2eeec8 100644 (file)
@@ -31,7 +31,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 d6e91a9c7fb966801189d8caac180dd5a5c5a710..d32748a27bcc0b93598a37e3fbee910154ceb7fc 100644 (file)
@@ -45,7 +45,7 @@
  *** Types
  ***/
 struct isc_backtrace_symmap {
-       void         *addr;
+       void       *addr;
        const char *symbol;
 };
 
index 9fbe0b9b10e01bbc8f40036428805f37eb552e54..b5188975a7669a2fb43f5a31c8a65abff2fbb808 100644 (file)
@@ -174,7 +174,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;
@@ -1052,7 +1052,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 c65401a22def8566efaf4f1730eb21b051908f12..7b66049bc8e15e237f9236f8981d27d37ee53ef0 100644 (file)
@@ -33,9 +33,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;
@@ -52,7 +52,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 6187ca1f6595b9bc4a1abeff85acb990605275a5..0209cbe8fcd519661db9f66ae9727ba5b0451ae3 100644 (file)
@@ -131,7 +131,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 bc4832e8ad3594e0ef6dfa74f5faa7a74c11b4b7..0e4f7f20a13717bc76d88c8d1020434a44a03744 100644 (file)
@@ -44,7 +44,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 81fa84a2ecb96dc16cf01c542e03cc8a235dd99a..289cbd751658d5a845dbb104dd797d80049d5c5d 100644 (file)
@@ -162,7 +162,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[];
 /*@}*/
 
@@ -444,7 +444,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 5ea4bd612b53a86c30ab4af2fcbfcce57a1dcdc5..b9f9a2434362d0916eacc6da30b1d58ffa716c1f 100644 (file)
@@ -49,7 +49,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 f6ad2926c4d4f7743946eeb02a8cd54743ea9204..7c004e92f9dd32ac2e570ad945c2bfc1504b9f2d 100644 (file)
@@ -44,7 +44,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" */
@@ -87,12 +87,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
@@ -106,7 +106,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 */
@@ -198,9 +198,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 4699a77437167723553d8b8fa2427a8a4b0cd371..c386617b6f3cba5ecb8900f353b4e9ae021e8a14 100644 (file)
@@ -25,7 +25,7 @@ struct isc_region {
 };
 
 struct isc_textregion {
-       char         *base;
+       char        *base;
        unsigned int length;
 };
 
index 8a95bbfa217ae2c4b833f9697c4223f37abc4112..dc39a3f34b7fb46d32aff7265939abb51f916575 100644 (file)
@@ -906,7 +906,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 9b14b923e179fd0fcc7ae2d4ccc36074cc282749..9ec8564835a261627346ebfbf62e086ebc49fb8f 100644 (file)
@@ -89,7 +89,7 @@
  ***/
 /*% Symbol table value. */
 typedef union isc_symvalue {
-       void         *as_pointer;
+       void        *as_pointer;
        const void  *as_cpointer;
        int          as_integer;
        unsigned int as_uinteger;
index 1a73bc38545601bc20eb55e0d27815983e818192..33965597cc0e0440b4dd2f0f014a1e523ec80875 100644 (file)
        do {                           \
                union {                \
                        const void *k; \
-                       void         *v; \
+                       void       *v; \
                } _u;                  \
                _u.k = konst;          \
                var = _u.v;            \
index ed06d57fa5782ff58cc0710a0d2da541cf2e03d2..076c11986c032a4729c21ae2762f7f50ebb0b567 100644 (file)
@@ -46,11 +46,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 b8d208f362eeb5c5d2750a2c1c9908fb487dc5ff..30228d21d2be788f1034631ac990378b7aef4b9d 100644 (file)
@@ -503,7 +503,7 @@ typedef unsigned long ck_attribute_type_t;
 
 struct ck_attribute {
        ck_attribute_type_t type;
-       void                 *value;
+       void               *value;
        unsigned long       value_len;
 };
 
@@ -888,7 +888,7 @@ typedef unsigned long ck_mechanism_type_t;
 
 struct ck_mechanism {
        ck_mechanism_type_t mechanism;
-       void                 *parameter;
+       void               *parameter;
        unsigned long       parameter_len;
 };
 
@@ -936,7 +936,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;
 };
 
@@ -1067,11 +1067,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));
@@ -1119,19 +1119,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,
@@ -1200,7 +1200,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,
@@ -1209,7 +1209,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));
 
@@ -1225,8 +1225,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,
@@ -1339,7 +1339,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)
@@ -1458,12 +1458,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_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 void            *CK_VOID_PTR;
+typedef void           **CK_VOID_PTR_PTR;
 #define CK_FALSE 0
 #define CK_TRUE         1
 #ifndef CK_DISABLE_TRUE_FALSE
@@ -1516,7 +1516,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 d136e1e10b2e17e8b468f147fde65038f24a8c60..6f831919df71e3e4d994d106417d8e12f4494708 100644 (file)
@@ -35,8 +35,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 fa47e84763296d425e9292f51292cb851c90ee76..89d1338d59e7c7f2a1c2b514642ac6cc1d83096c 100644 (file)
@@ -35,7 +35,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 2ed15cd7ebc0b29dd00bb1ad955bd48ad85742cb..db64fcf850ad75e29ffb1a647aa444aa32fb4f37 100644 (file)
@@ -45,11 +45,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 a5e2e995b44d832b88f8ffa664f071cb1a03dc57..dae990651c79f50ed4f9ecc682284cb34352d476 100644 (file)
@@ -51,7 +51,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 1012f2a04b3fc9908f8ba1b9ae9b6b668301340d..ff978b20ba5baed49c25acf81e634f649a6f4cd3 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 6d595a08b11516c13dc347ac8255d1a283c8f972..546423dce258c7a014739396bb3584d9fbc440a7 100644 (file)
        do {                           \
                union {                \
                        const void *k; \
-                       void         *v; \
+                       void       *v; \
                } _u;                  \
                _u.k = konst;          \
                var = _u.v;            \
index 9a0391ac44479293e6e5a23757c880578f28a285..7c460d22e75844544568a9cd2cf514d37bf4f59f 100644 (file)
@@ -72,7 +72,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);
 
 /***
@@ -581,9 +581,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 6e899559421b42a8f3a3094ef9c6dfe9069a69e6..b040eb84c73efd63627c9fcd980106f9fe8e0203 100644 (file)
@@ -130,17 +130,17 @@ struct cfg_tuplefielddef {
 
 /*% 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;
 
@@ -183,7 +183,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. */
 };
 
@@ -201,7 +201,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;
@@ -211,7 +211,7 @@ 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;
 };
@@ -224,9 +224,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;
@@ -280,7 +280,7 @@ struct cfg_parser {
        isc_refcount_t references;
 
        cfg_parsecallback_t callback;
-       void                 *callbackarg;
+       void               *callbackarg;
 };
 
 /* Parser context flags */
index 91e8ccf8dcf70155f7b54a1a19913351da992be5..9d152c6bbe8ba30f82f66ab42e8eb36441e06a6d 100644 (file)
@@ -146,11 +146,11 @@ struct ns_clientmgr {
        /* Unlocked. */
        unsigned int magic;
 
-       isc_mem_t         *mctx;
+       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;
 
@@ -174,21 +174,21 @@ 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 */
index 057f20999e596ff571ed77761da4bfbd8ab06e49..db3846d48507c8ed851b364a40b514c9f31d256b 100644 (file)
@@ -236,9 +236,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 6407b71c1a31c6e9e122ac3a5a21eb26c6849c9d..9f696e2725c7ee8cbf761830d8db0dfcf3d5298b 100644 (file)
@@ -77,7 +77,7 @@ 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_nmsocket_t *udplistensocket;
index d34d6b827f1efa3dbca2f69ef00ec027be69392c..eb12ff6aed59a2d0aca8b47bd7baa0e79c507711 100644 (file)
@@ -19,7 +19,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 74e93a705749880d9497f0cdb4d515269fd46ce4..142ef8c6c1d5bbac7a836a18d2155a462224af87 100644 (file)
@@ -31,7 +31,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;
@@ -44,9 +44,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;
 
@@ -55,36 +55,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_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;
@@ -159,16 +159,16 @@ 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 */
index 68efcfe6a64c17ccda286209767993aa930d6436..8edfcd3c8b1b8e8ddc35fc4c76ea42d36344f535 100644 (file)
@@ -72,7 +72,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;
 
@@ -90,15 +90,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 */
index 0441ce0749fc62f44939c8d1bc6aeeab43038355..a2eedd980ac584cb2960f4e182bf46fc626b2432 100644 (file)
@@ -25,7 +25,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.
@@ -70,7 +70,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.