Move zonediff_t to lib/dns/zone_p.h

Rename zonediff_t to dns__zonediff_t and move it to lib/dns/zone_p.h, so
that unit tests can be written for functions taking pointers to
structures of this type as arguments.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index e6f48864e8c8c1320ca3724bfd0a13efca04e014..fd716e12f8dde6ae54a22deec83391756313a123 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -433,14 +433,9 @@ struct dns_zone {
        isc_stats_t             *gluecachestats;
 };
 
-typedef struct {
-       dns_diff_t      *diff;
-       isc_boolean_t   offline;
-} zonediff_t;
-
 #define zonediff_init(z, d) \
        do { \
-               zonediff_t *_z = (z); \
+               dns__zonediff_t *_z = (z); \
                (_z)->diff = (d); \
                (_z)->offline = ISC_FALSE; \
        } while (0)
@@ -6001,7 +5996,7 @@ find_zone_keys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
 }
 
 static isc_result_t
-offline(dns_db_t *db, dns_dbversion_t *ver, zonediff_t *zonediff,
+offline(dns_db_t *db, dns_dbversion_t *ver, dns__zonediff_t *zonediff,
        dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata)
 {
        isc_result_t result;
@@ -6110,7 +6105,7 @@ delsig_ok(dns_rdata_rrsig_t *rrsig_ptr, dst_key_t **keys, unsigned int nkeys,
  */
 static isc_result_t
 del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
-        dns_rdatatype_t type, zonediff_t *zonediff, dst_key_t **keys,
+        dns_rdatatype_t type, dns__zonediff_t *zonediff, dst_key_t **keys,
         unsigned int nkeys, isc_stdtime_t now, isc_boolean_t incremental)
 {
        isc_result_t result;
@@ -6403,7 +6398,7 @@ zone_resigninc(dns_zone_t *zone) {
        dns_db_t *db = NULL;
        dns_dbversion_t *version = NULL;
        dns_diff_t _sig_diff;
-       zonediff_t zonediff;
+       dns__zonediff_t zonediff;
        dns_fixedname_t fixed;
        dns_name_t *name;
        dns_rdataset_t rdataset;
@@ -7293,7 +7288,7 @@ update_sigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version,
            isc_stdtime_t inception, isc_stdtime_t expire,
            isc_stdtime_t keyexpire, isc_stdtime_t now,
            isc_boolean_t check_ksk, isc_boolean_t keyset_kskonly,
-           zonediff_t *zonediff)
+           dns__zonediff_t *zonediff)
 {
        dns_difftuple_t *tuple;
        isc_result_t result;
@@ -7360,7 +7355,7 @@ zone_nsec3chain(dns_zone_t *zone) {
        dns_diff_t nsec_diff;
        dns_diff_t nsec3_diff;
        dns_diff_t param_diff;
-       zonediff_t zonediff;
+       dns__zonediff_t zonediff;
        dns_fixedname_t fixed;
        dns_fixedname_t nextfixed;
        dns_name_t *name, *nextname;
@@ -8256,7 +8251,7 @@ zone_sign(dns_zone_t *zone) {
        dns_dbversion_t *version = NULL;
        dns_diff_t _sig_diff;
        dns_diff_t post_diff;
-       zonediff_t zonediff;
+       dns__zonediff_t zonediff;
        dns_fixedname_t fixed;
        dns_fixedname_t nextfixed;
        dns_name_t *name, *nextname;
@@ -17515,7 +17510,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype,
 
 static isc_result_t
 sign_apex(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
-         isc_stdtime_t now, dns_diff_t *diff, zonediff_t *zonediff)
+         isc_stdtime_t now, dns_diff_t *diff, dns__zonediff_t *zonediff)
 {
        isc_result_t result;
        isc_stdtime_t inception, soaexpire, keyexpire;
@@ -17741,7 +17736,7 @@ zone_rekey(dns_zone_t *zone) {
        dns_dnsseckeylist_t dnskeys, keys, rmkeys;
        dns_dnsseckey_t *key;
        dns_diff_t diff, _sig_diff;
-       zonediff_t zonediff;
+       dns__zonediff_t zonediff;
        isc_boolean_t commit = ISC_FALSE, newactive = ISC_FALSE;
        isc_boolean_t newalg = ISC_FALSE;
        isc_boolean_t fullsign;

diff --git a/lib/dns/zone_p.h b/lib/dns/zone_p.h
index 24329b0e490eb0bea23b68c52d40533493af5ded..3ef05e023ce2fd82078203a3f6a2077361b1c2f1 100644 (file)
--- a/lib/dns/zone_p.h
+++ b/lib/dns/zone_p.h
@@ -21,6 +21,11 @@
 
 ISC_LANG_BEGINDECLS
 
+typedef struct {
+       dns_diff_t      *diff;
+       isc_boolean_t   offline;
+} dns__zonediff_t;
+
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_ZONE_P_H */