libdns refactoring: get rid of unnecessary dns_db_dump2 and 3 versions of dns_db_load

diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c
index 4758c476d6f38289107d382e61557998f15fe4a5..6249a1b178f412a985e4cc2e5feaf7c864d035d1 100644 (file)
--- a/bin/dnssec/dnssec-cds.c
+++ b/bin/dnssec/dnssec-cds.c
@@ -254,8 +254,8 @@ load_db(const char *filename, dns_db_t **dbp, dns_dbnode_t **nodep) {
                               rdclass, 0, NULL, dbp);
        check_result(result, "dns_db_create()");
 
-       result = dns_db_load3(*dbp, filename,
-                             dns_masterformat_text, DNS_MASTER_HINT);
+       result = dns_db_load(*dbp, filename,
+                            dns_masterformat_text, DNS_MASTER_HINT);
        if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE) {
                fatal("can't load %s: %s", filename,
                      isc_result_totext(result));

diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
index 44968404b7b940d50d9555e87950b961cf28b1db..383bee36be05c1568ccbb7e88f3c0ae53671f9a7 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -114,7 +114,7 @@ loadset(const char *filename, dns_rdataset_t *rdataset) {
                db_load_from_stream(db, stdin);
                filename = "input";
        } else {
-               result = dns_db_load(db, filename);
+               result = dns_db_load(db, filename, dns_masterformat_text, 0);
                if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE)
                        fatal("can't load %s: %s", filename,
                              isc_result_totext(result));

diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c
index 76c384eff59f6c78737cfbcacf13a963a0c79dfc..fa8788e2366262c86a3214f3654ec5a971e03d20 100644 (file)
--- a/bin/dnssec/dnssec-importkey.c
+++ b/bin/dnssec/dnssec-importkey.c
@@ -119,8 +119,8 @@ loadset(const char *filename, dns_rdataset_t *rdataset) {
                db_load_from_stream(db, stdin);
                filename = "input";
        } else {
-               result = dns_db_load3(db, filename, dns_masterformat_text,
-                                     DNS_MASTER_NOTTL);
+               result = dns_db_load(db, filename, dns_masterformat_text,
+                                    DNS_MASTER_NOTTL);
                if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE)
                        fatal("can't load %s: %s", filename,
                              isc_result_totext(result));

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 894752ae3389e03b638c1e3858ab4aee540985a4..1f15017516a8f716c56f26b05f78785065ddef17 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -905,7 +905,7 @@ opendb(const char *prefix, dns_name_t *name, dns_rdataclass_t rdclass,
                               rdclass, 0, NULL, dbp);
        check_result(result, "dns_db_create()");
 
-       result = dns_db_load3(*dbp, filename, inputformat, DNS_MASTER_HINT);
+       result = dns_db_load(*dbp, filename, inputformat, DNS_MASTER_HINT);
        if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE)
                dns_db_detach(dbp);
 }
@@ -2470,7 +2470,7 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) {
                               rdclass, 0, NULL, db);
        check_result(result, "dns_db_create()");
 
-       result = dns_db_load2(*db, file, inputformat);
+       result = dns_db_load(*db, file, inputformat, 0);
        if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE)
                fatal("failed loading zone from '%s': %s",
                      file, isc_result_totext(result));

diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c
index 8e6dda2acfaebe66bc37175ca9344657486bf606..54acb7a57f6bc0f9840e741510219c321c36431f 100644 (file)
--- a/bin/dnssec/dnssec-verify.c
+++ b/bin/dnssec/dnssec-verify.c
@@ -108,7 +108,7 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) {
                               rdclass, 0, NULL, db);
        check_result(result, "dns_db_create()");
 
-       result = dns_db_load2(*db, file, inputformat);
+       result = dns_db_load(*db, file, inputformat, 0);
        switch (result) {
        case DNS_R_SEENINCLUDE:
        case ISC_R_SUCCESS:

diff --git a/bin/tests/makejournal.c b/bin/tests/makejournal.c
index 37c70a78a7943194ec36898cb528b4b6122eeaea..03481b9ce2aa43df9681b8d149a93fff518fd175 100644 (file)
--- a/bin/tests/makejournal.c
+++ b/bin/tests/makejournal.c
@@ -75,7 +75,7 @@ loadzone(dns_db_t **db, const char *origin, const char *filename) {
        if (result != ISC_R_SUCCESS)
                return (result);
 
-       result = dns_db_load(*db, filename);
+       result = dns_db_load(*db, filename, dns_masterformat_text, 0);
        return (result);
 }
 

diff --git a/bin/tests/optional/db_test.c b/bin/tests/optional/db_test.c
index bc5d08f9e18ed5fc39e3c1ccdd028ddbb7fed327..b3903cca7544c8c3356119f97e8cdfa94ea205f3 100644 (file)
--- a/bin/tests/optional/db_test.c
+++ b/bin/tests/optional/db_test.c
@@ -274,7 +274,7 @@ load(const char *filename, const char *origintext, isc_boolean_t cache) {
        }
 
        printf("loading %s (%s)\n", filename, origintext);
-       result = dns_db_load(dbi->db, filename);
+       result = dns_db_load(dbi->db, filename, dns_masterformat_text, 0);
        if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE) {
                dns_db_detach(&dbi->db);
                isc_mem_put(mctx, dbi, sizeof(*dbi));

diff --git a/bin/tests/optional/nsecify.c b/bin/tests/optional/nsecify.c
index 5371bc4d448b7b307238d8b7ff38a24f2cd844f4..3413399ec30611740d386b19742cd627186da873 100644 (file)
--- a/bin/tests/optional/nsecify.c
+++ b/bin/tests/optional/nsecify.c
@@ -138,7 +138,7 @@ nsecify(char *filename) {
        result = dns_db_create(mctx, "rbt", name, dns_dbtype_zone,
                               dns_rdataclass_in, 0, NULL, &db);
        check_result(result, "dns_db_create()");
-       result = dns_db_load(db, filename);
+       result = dns_db_load(db, filename, dns_masterformat_text, 0);
        if (result == DNS_R_SEENINCLUDE)
                result = ISC_R_SUCCESS;
        check_result(result, "dns_db_load()");

diff --git a/contrib/sdb/bdb/zone2bdb.c b/contrib/sdb/bdb/zone2bdb.c
index e711853175bee014142c6cf648ee96ced58460c7..1d92804b65e1030c468cf19345b6f491f51f123d 100644 (file)
--- a/contrib/sdb/bdb/zone2bdb.c
+++ b/contrib/sdb/bdb/zone2bdb.c
@@ -142,7 +142,8 @@ main(int argc, char *argv[])
                              dns_dbtype_zone, dns_rdataclass_in, 0, NULL,
                              &db) == ISC_R_SUCCESS);
 
-       REQUIRE(dns_db_load(db, argv[2]) == ISC_R_SUCCESS);
+       REQUIRE(dns_db_load(db, argv[2], dns_masterformat_text, 0)
+               == ISC_R_SUCCESS);
 
        REQUIRE(dns_db_createiterator(db, 0, &dbiter) == ISC_R_SUCCESS);
 

diff --git a/contrib/sdb/ldap/zone2ldap.c b/contrib/sdb/ldap/zone2ldap.c
index 3f5030307da923ac27fc36583122ca4a467ef61a..61ef42c0ca2bf19169495428d9c48129966c1b58 100644 (file)
--- a/contrib/sdb/ldap/zone2ldap.c
+++ b/contrib/sdb/ldap/zone2ldap.c
@@ -228,7 +228,7 @@ main (int argc, char **argv)
                          dns_rdataclass_in, 0, NULL, &db);
   isc_result_check (result, "dns_db_create");
 
-  result = dns_db_load (db, zonefile);
+  result = dns_db_load(db, zonefile, dns_masterformat_text, 0);
   isc_result_check (result, "Check Zone Syntax: dns_db_load");
 
   result = dns_db_createiterator (db, 0, &dbit);

diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
index dc63c5b540c97072a7d946b6cb1e5048642a9e7c..6a1562c8d72f75b7721a5ea05843a5dca86e32b8 100644 (file)
--- a/contrib/sdb/pgsql/zonetodb.c
+++ b/contrib/sdb/pgsql/zonetodb.c
@@ -173,7 +173,7 @@ main(int argc, char **argv) {
                               dns_rdataclass_in, 0, NULL, &db);
        check_result(result, "dns_db_create");
 
-       result = dns_db_load(db, zonefile);
+       result = dns_db_load(db, zonefile, dns_masterformat_text, 0);
        if (result == DNS_R_SEENINCLUDE)
                result = ISC_R_SUCCESS;
        check_result(result, "dns_db_load");

diff --git a/contrib/sdb/sqlite/zone2sqlite.c b/contrib/sdb/sqlite/zone2sqlite.c
index 88a2d014694625af871ce3795c9aa9c2cf1c535f..4137c7d2c7fa38c739de3531b9e7888555f2406c 100644 (file)
--- a/contrib/sdb/sqlite/zone2sqlite.c
+++ b/contrib/sdb/sqlite/zone2sqlite.c
@@ -182,7 +182,7 @@ main(int argc, char *argv[])
                           dns_rdataclass_in, 0, NULL, &db);
     check_result(result, "dns_db_create");
     
-    result = dns_db_load(db, zonefile);
+    result = dns_db_load(db, zonefile, dns_masterformat_text, 0);
     if (result == DNS_R_SEENINCLUDE)
        result = ISC_R_SUCCESS;
     check_result(result, "dns_db_load");

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index d37a018d0909f536b71072a216acd1053e58414c..952fd997d46822c11e363b70e5017206a5aa2481 100644 (file)
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -500,7 +500,8 @@ dns_cache_load(dns_cache_t *cache) {
                return (ISC_R_SUCCESS);
 
        LOCK(&cache->filelock);
-       result = dns_db_load(cache->db, cache->filename);
+       result = dns_db_load(cache->db, cache->filename,
+                            dns_masterformat_text, 0);
        UNLOCK(&cache->filelock);
 
        return (result);

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 6006db0591271e35489425140c0343cc47f9c905..6a2ca110abec95e708388e8a1133b96349df6949 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -310,18 +310,8 @@ dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) {
 }
 
 isc_result_t
-dns_db_load(dns_db_t *db, const char *filename) {
-       return (dns_db_load3(db, filename, dns_masterformat_text, 0));
-}
-
-isc_result_t
-dns_db_load2(dns_db_t *db, const char *filename, dns_masterformat_t format) {
-       return (dns_db_load3(db, filename, format, 0));
-}
-
-isc_result_t
-dns_db_load3(dns_db_t *db, const char *filename, dns_masterformat_t format,
-            unsigned int options)
+dns_db_load(dns_db_t *db, const char *filename, dns_masterformat_t format,
+           unsigned int options)
 {
        isc_result_t result, eresult;
        dns_rdatacallbacks_t callbacks;
@@ -369,20 +359,6 @@ dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename) {
                                    dns_masterformat_text));
 }
 
-isc_result_t
-dns_db_dump2(dns_db_t *db, dns_dbversion_t *version, const char *filename,
-            dns_masterformat_t masterformat) {
-       /*
-        * Dump 'db' into master file 'filename' in the 'masterformat' format.
-        * XXXJT: is it okay to modify the interface to the existing "dump"
-        * method?
-        */
-
-       REQUIRE(DNS_DB_VALID(db));
-
-       return ((db->methods->dump)(db, version, filename, masterformat));
-}
-
 /***
  *** Version Methods
  ***/

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 6b7a2528589a80f83e5f995fc8689831075badae..121c62a703027e6459a74e30a03dfe351745f5d2 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -518,14 +518,8 @@ dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks);
  */
 
 isc_result_t
-dns_db_load(dns_db_t *db, const char *filename);
-
-isc_result_t
-dns_db_load2(dns_db_t *db, const char *filename, dns_masterformat_t format);
-
-isc_result_t
-dns_db_load3(dns_db_t *db, const char *filename, dns_masterformat_t format,
-            unsigned int options);
+dns_db_load(dns_db_t *db, const char *filename, dns_masterformat_t format,
+           unsigned int options);
 /*%<
  * Load master file 'filename' into 'db'.
  *
@@ -575,10 +569,6 @@ dns_db_serialize(dns_db_t *db, dns_dbversion_t *version, FILE *rbtfile);
 
 isc_result_t
 dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename);
-
-isc_result_t
-dns_db_dump2(dns_db_t *db, dns_dbversion_t *version, const char *filename,
-            dns_masterformat_t masterformat);
 /*%<
  * Dump version 'version' of 'db' to master file 'filename'.
  *

diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c
index f002a13962d354e06d1cc7bea93cec48aae95abb..1319682b087eea44d717fc76123e45e3e69fc823 100644 (file)
--- a/lib/dns/tests/db_test.c
+++ b/lib/dns/tests/db_test.c
@@ -280,7 +280,8 @@ ATF_TC_BODY(class, tc) {
                               dns_rdataclass_in, 0, NULL, &db);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-       result = dns_db_load(db, "testdata/db/data.db");
+       result = dns_db_load(db, "testdata/db/data.db",
+                            dns_masterformat_text, 0);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
        ATF_CHECK_EQ(dns_db_class(db), dns_rdataclass_in);
@@ -303,7 +304,8 @@ ATF_TC_BODY(dbtype, tc) {
        result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone,
                               dns_rdataclass_in, 0, NULL, &db);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-       result = dns_db_load(db, "testdata/db/data.db");
+       result = dns_db_load(db, "testdata/db/data.db",
+                            dns_masterformat_text, 0);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
        ATF_CHECK(dns_db_iszone(db));
        ATF_CHECK(!dns_db_iscache(db));
@@ -313,7 +315,8 @@ ATF_TC_BODY(dbtype, tc) {
        result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_cache,
                               dns_rdataclass_in, 0, NULL, &db);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-       result = dns_db_load(db, "testdata/db/data.db");
+       result = dns_db_load(db, "testdata/db/data.db",
+                            dns_masterformat_text, 0);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
        ATF_CHECK(dns_db_iscache(db));
        ATF_CHECK(!dns_db_iszone(db));

diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index 1a546fa802cdde0444c72d2be0dcf61c611993a6..ef6d1844c091c3b16bfab85dab62c3f934b98d96 100644 (file)
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -335,7 +335,7 @@ dns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin,
        if (result != ISC_R_SUCCESS)
                return (result);
 
-       result = dns_db_load(*db, testfile);
+       result = dns_db_load(*db, testfile, dns_masterformat_text, 0);
        return (result);
 }
 

diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index 3abb6782fa11f6fb4e5bb8c7569a059535cc2e59..7e7865debc08facb63f1f6b78b371a21ffdb3654 100644 (file)
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -574,7 +574,8 @@ ATF_TC_BODY(dumpraw, tc) {
                               dns_rdataclass_in, 0, NULL, &db);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-       result = dns_db_load(db, "testdata/master/master1.data");
+       result = dns_db_load(db, "testdata/master/master1.data",
+                            dns_masterformat_text, 0);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
        dns_db_currentversion(db, &version);

diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index 45b2af1da0625b33be8a2b5d646f520c623fc327..025808d1284ca82c8e749dcbe539921187cf890f 100644 (file)
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -186,7 +186,6 @@ dns_db_detachnode
 dns_db_diff
 dns_db_diffx
 dns_db_dump
-dns_db_dump2
 dns_db_endload
 dns_db_expirenode
 dns_db_find
@@ -211,8 +210,6 @@ dns_db_issecure
 dns_db_isstub
 dns_db_iszone
 dns_db_load
-dns_db_load2
-dns_db_load3
 dns_db_newversion
 dns_db_nodecount
 dns_db_nodefullname

diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c
index 696ddd2b82f9b3bcb367b4f9715dfecb9d9b5e56..966477610c9e1734988e2c0b1d4d31be625a2582 100644 (file)
--- a/lib/ns/tests/nstest.c
+++ b/lib/ns/tests/nstest.c
@@ -853,7 +853,7 @@ ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin,
        if (result != ISC_R_SUCCESS)
                return (result);
 
-       result = dns_db_load(*db, testfile);
+       result = dns_db_load(*db, testfile, dns_masterformat_text, 0);
        return (result);
 }