upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-29 18:09:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ondrej-clang-format-17-bind-9.18' into 'bind-9.18'

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

See merge request isc-projects/bind9!8489
This commit is contained in:
Ondřej Surý 2023-11-13 16:22:04 +00:00
commit 50a7594475
13 changed files with 62 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.git-blame-ignore-revs
View file

@ -18,3 +18,5 @@ e577b1eca70856b816ffa36199f14078e4b76b58
59e5fa42179366049fb31265532d504208f0329f
# reformat shell scripts with shfmt
b8b9b4ac2c0ae88de85f4d83982edb97694959d7
# Reformat sources with up-to-date clang-format-17
6a85e79c0b349003449f9c9a64eba74a97653826

32
lib/dns/include/dns/db.h
View file

@ -75,8 +75,8 @@ extern unsigned int dns_pps;
*****/
typedef struct dns_dbmethods {
void (*attach)(dns_db_t *source, dns_db_t **targetp);
void (*detach)(dns_db_t **dbp);
void (*attach)(dns_db_t *source, dns_db_t **targetp);
void (*detach)(dns_db_t **dbp);
isc_result_t (*beginload)(dns_db_t *db,
dns_rdatacallbacks_t *callbacks);
isc_result_t (*endload)(dns_db_t *db, dns_rdatacallbacks_t *callbacks);
@ -85,9 +85,9 @@ typedef struct dns_dbmethods {
dns_masterformat_t masterformat);
void (*currentversion)(dns_db_t *db, dns_dbversion_t **versionp);
isc_result_t (*newversion)(dns_db_t *db, dns_dbversion_t **versionp);
void (*attachversion)(dns_db_t *db, dns_dbversion_t *source,
void (*attachversion)(dns_db_t *db, dns_dbversion_t *source,
dns_dbversion_t **targetp);
void (*closeversion)(dns_db_t *db, dns_dbversion_t **versionp,
void (*closeversion)(dns_db_t *db, dns_dbversion_t **versionp,
bool commit);
isc_result_t (*findnode)(dns_db_t *db, const dns_name_t *name,
bool create, dns_dbnode_t **nodep);
@ -103,12 +103,12 @@ typedef struct dns_dbmethods {
dns_name_t *dcname,
dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset);
void (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
void (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
dns_dbnode_t **targetp);
void (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp);
void (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp);
isc_result_t (*expirenode)(dns_db_t *db, dns_dbnode_t *node,
isc_stdtime_t now);
void (*printnode)(dns_db_t *db, dns_dbnode_t *node, FILE *out);
void (*printnode)(dns_db_t *db, dns_dbnode_t *node, FILE *out);
isc_result_t (*createiterator)(dns_db_t *db, unsigned int options,
dns_dbiterator_t **iteratorp);
isc_result_t (*findrdataset)(dns_db_t *db, dns_dbnode_t *node,
@ -135,13 +135,13 @@ typedef struct dns_dbmethods {
dns_dbversion_t *version,
dns_rdatatype_t type,
dns_rdatatype_t covers);
bool (*issecure)(dns_db_t *db);
bool (*issecure)(dns_db_t *db);
unsigned int (*nodecount)(dns_db_t *db, dns_dbtree_t);
bool (*ispersistent)(dns_db_t *db);
void (*overmem)(dns_db_t *db, bool overmem);
void (*settask)(dns_db_t *db, isc_task_t *);
bool (*ispersistent)(dns_db_t *db);
void (*overmem)(dns_db_t *db, bool overmem);
void (*settask)(dns_db_t *db, isc_task_t *);
isc_result_t (*getoriginnode)(dns_db_t *db, dns_dbnode_t **nodep);
void (*transfernode)(dns_db_t *db, dns_dbnode_t **sourcep,
void (*transfernode)(dns_db_t *db, dns_dbnode_t **sourcep,
dns_dbnode_t **targetp);
isc_result_t (*getnsec3parameters)(dns_db_t *db,
dns_dbversion_t *version,
@ -155,11 +155,11 @@ typedef struct dns_dbmethods {
isc_stdtime_t resign);
isc_result_t (*getsigningtime)(dns_db_t *db, dns_rdataset_t *rdataset,
dns_name_t *name);
void (*resigned)(dns_db_t *db, dns_rdataset_t *rdataset,
void (*resigned)(dns_db_t *db, dns_rdataset_t *rdataset,
dns_dbversion_t *version);
bool (*isdnssec)(dns_db_t *db);
bool (*isdnssec)(dns_db_t *db);
dns_stats_t *(*getrrsetstats)(dns_db_t *db);
void (*rpz_attach)(dns_db_t *db, void *rpzs, uint8_t rpz_num);
void (*rpz_attach)(dns_db_t *db, void *rpzs, uint8_t rpz_num);
isc_result_t (*rpz_ready)(dns_db_t *db);
isc_result_t (*findnodeext)(dns_db_t *db, const dns_name_t *name,
bool create,
@ -175,7 +175,7 @@ typedef struct dns_dbmethods {
dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset);
isc_result_t (*setcachestats)(dns_db_t *db, isc_stats_t *stats);
size_t (*hashsize)(dns_db_t *db);
size_t (*hashsize)(dns_db_t *db);
isc_result_t (*nodefullname)(dns_db_t *db, dns_dbnode_t *node,
dns_name_t *name);
isc_result_t (*getsize)(dns_db_t *db, dns_dbversion_t *version,

2
lib/dns/include/dns/dbiterator.h
View file

@ -68,7 +68,7 @@ ISC_LANG_BEGINDECLS
*****/
typedef struct dns_dbiteratormethods {
void (*destroy)(dns_dbiterator_t **iteratorp);
void (*destroy)(dns_dbiterator_t **iteratorp);
isc_result_t (*first)(dns_dbiterator_t *iterator);
isc_result_t (*last)(dns_dbiterator_t *iterator);
isc_result_t (*seek)(dns_dbiterator_t *iterator,

6
lib/dns/include/dns/keytable.h
View file

@ -345,7 +345,7 @@ dns_keynode_trust(dns_keynode_t *keynode);
isc_result_t
dns_keytable_forall(dns_keytable_t *keytable,
void (*func)(dns_keytable_t *, dns_keynode_t *,
dns_name_t *, void *),
void *arg);
void (*func)(dns_keytable_t *, dns_keynode_t *,
dns_name_t *, void *),
void *arg);
ISC_LANG_ENDDECLS

2
lib/dns/include/dns/rbt.h
View file

@ -699,7 +699,7 @@ dns_rbt_destroy2(dns_rbt_t **rbtp, unsigned int quantum);
void
dns_rbt_printtext(dns_rbt_t *rbt, void (*data_printer)(FILE *, void *),
FILE *f);
FILE *f);
/*%<
* Print an ASCII representation of the internal structure of the red-black
* tree of trees to the passed stream.

12
lib/dns/include/dns/rdataset.h
View file

@ -63,11 +63,11 @@ typedef enum {
} dns_rdatasetadditional_t;
typedef struct dns_rdatasetmethods {
void (*disassociate)(dns_rdataset_t *rdataset);
void (*disassociate)(dns_rdataset_t *rdataset);
isc_result_t (*first)(dns_rdataset_t *rdataset);
isc_result_t (*next)(dns_rdataset_t *rdataset);
void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
void (*clone)(dns_rdataset_t *source, dns_rdataset_t *target);
void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
void (*clone)(dns_rdataset_t *source, dns_rdataset_t *target);
unsigned int (*count)(dns_rdataset_t *rdataset);
isc_result_t (*addnoqname)(dns_rdataset_t *rdataset,
const dns_name_t *name);
@ -77,9 +77,9 @@ typedef struct dns_rdatasetmethods {
const dns_name_t *name);
isc_result_t (*getclosest)(dns_rdataset_t *rdataset, dns_name_t *name,
dns_rdataset_t *neg, dns_rdataset_t *negsig);
void (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
void (*expire)(dns_rdataset_t *rdataset);
void (*clearprefetch)(dns_rdataset_t *rdataset);
void (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
void (*expire)(dns_rdataset_t *rdataset);
void (*clearprefetch)(dns_rdataset_t *rdataset);
void (*setownercase)(dns_rdataset_t *rdataset, const dns_name_t *name);
void (*getownercase)(const dns_rdataset_t *rdataset, dns_name_t *name);
isc_result_t (*addglue)(dns_rdataset_t *rdataset,

2
lib/dns/include/dns/rdatasetiter.h
View file

@ -67,7 +67,7 @@ ISC_LANG_BEGINDECLS
*****/
typedef struct dns_rdatasetitermethods {
void (*destroy)(dns_rdatasetiter_t **iteratorp);
void (*destroy)(dns_rdatasetiter_t **iteratorp);
isc_result_t (*first)(dns_rdatasetiter_t *iterator);
isc_result_t (*next)(dns_rdatasetiter_t *iterator);
void (*current)(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset);

4
lib/dns/include/dns/update.h
View file

@ -27,8 +27,8 @@
#include <dns/types.h>
typedef struct {
void (*func)(void *arg, dns_zone_t *zone, int level,
const char *message);
void (*func)(void *arg, dns_zone_t *zone, int level,
const char *message);
void *arg;
} dns_update_log_t;

18
lib/dns/include/dns/view.h
View file

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

6
lib/isc/include/isc/thread.h
View file

@ -31,9 +31,9 @@ extern thread_local size_t isc_tid_v;
ISC_LANG_BEGINDECLS
typedef pthread_t isc_thread_t;
typedef void *isc_threadresult_t;
typedef void *isc_threadarg_t;
typedef pthread_t isc_thread_t;
typedef void *isc_threadresult_t;
typedef void *isc_threadarg_t;
typedef isc_threadresult_t (*isc_threadfunc_t)(isc_threadarg_t);
void

8
lib/isccfg/include/isccfg/cfg.h
View file

@ -481,11 +481,11 @@ cfg_listelt_value(const cfg_listelt_t *elt);
void
cfg_print(const cfg_obj_t *obj,
void (*f)(void *closure, const char *text, int textlen),
void *closure);
void (*f)(void *closure, const char *text, int textlen),
void *closure);
void
cfg_printx(const cfg_obj_t *obj, unsigned int flags,
void (*f)(void *closure, const char *text, int textlen),
void (*f)(void *closure, const char *text, int textlen),
void *closure);
#define CFG_PRINTER_XKEY 0x1 /* '?' out shared keys. */
@ -507,7 +507,7 @@ cfg_printx(const cfg_obj_t *obj, unsigned int flags,
void
cfg_print_grammar(const cfg_type_t *type, unsigned int flags,
void (*f)(void *closure, const char *text, int textlen),
void (*f)(void *closure, const char *text, int textlen),
void *closure);
/*%<
* Print a summary of the grammar of the configuration type 'type'.

10
lib/isccfg/include/isccfg/grammar.h
View file

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

18
lib/ns/include/ns/client.h
View file

@ -194,15 +194,15 @@ struct ns_client {
uint16_t extflags;
int16_t ednsversion; /* -1 noedns */
uint16_t additionaldepth;
void (*cleanup)(ns_client_t *);
ns_query_t query;
isc_time_t requesttime;
isc_stdtime_t now;
isc_time_t tnow;
dns_name_t signername; /*%< [T]SIG key name */
dns_name_t *signer; /*%< NULL if not valid sig */
bool mortal; /*%< Die after handling request */
isc_quota_t *recursionquota;
void (*cleanup)(ns_client_t *);
ns_query_t query;
isc_time_t requesttime;
isc_stdtime_t now;
isc_time_t tnow;
dns_name_t signername; /*%< [T]SIG key name */
dns_name_t *signer; /*%< NULL if not valid sig */
bool mortal; /*%< Die after handling request */
isc_quota_t *recursionquota;
isc_sockaddr_t peeraddr;
bool peeraddr_valid;