diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h index ebb85565ec..4114cb2932 100644 --- a/lib/dns/include/dns/keytable.h +++ b/lib/dns/include/dns/keytable.h @@ -429,7 +429,7 @@ dns_keynode_detachall(isc_mem_t *mctx, dns_keynode_t **target); isc_result_t dns_keytable_forall(dns_keytable_t *keytable, - void (*func)(dns_keytable_t *, dns_keynode_t *, void *), + void (*func)(dns_keytable_t *, dns_keynode_t *, void *), void *arg); ISC_LANG_ENDDECLS diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c index 1817b27787..042e9bb5bf 100644 --- a/lib/dns/keytable.c +++ b/lib/dns/keytable.c @@ -30,24 +30,24 @@ #define VALID_KEYNODE(kn) ISC_MAGIC_VALID(kn, KEYNODE_MAGIC) struct dns_keytable { - /* Unlocked. */ - unsigned int magic; - isc_mem_t *mctx; - isc_mutex_t lock; - isc_rwlock_t rwlock; - /* Locked by lock. */ - isc_uint32_t active_nodes; - /* Locked by rwlock. */ - isc_uint32_t references; - dns_rbt_t *table; + /* Unlocked. */ + unsigned int magic; + isc_mem_t *mctx; + isc_mutex_t lock; + isc_rwlock_t rwlock; + /* Locked by lock. */ + isc_uint32_t active_nodes; + /* Locked by rwlock. */ + isc_uint32_t references; + dns_rbt_t *table; }; struct dns_keynode { - unsigned int magic; - isc_refcount_t refcount; - dst_key_t * key; - isc_boolean_t managed; - struct dns_keynode * next; + unsigned int magic; + isc_refcount_t refcount; + dst_key_t * key; + isc_boolean_t managed; + struct dns_keynode * next; }; static void diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 38f5dd9b48..96a71d0e09 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -4052,7 +4052,7 @@ addifmissing(dns_keytable_t *keytable, dns_keynode_t *keynode, void *arg) { return; dns_keytable_attachkeynode(keytable, keynode, &dummy); result = create_keydata(zone, db, ver, diff, keytable, - &dummy, changed); + &dummy, changed); if (result != ISC_R_SUCCESS && result != ISC_R_NOMORE) ((struct addifmissing_arg *)arg)->result = result; }