remove unnecessary dns_db_nodefullname()

now that node->name is accessible as a common dbnode member,
it's no longer necessary to provide an API call for that.

diff --git a/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c
index f11f6930e4bcbd6f09acd3bcd005fd5f63768801..f23e0793c8b4958c1099201ca06d07c9ce435380 100644 (file)
--- a/bin/tests/system/dyndb/driver/db.c
+++ b/bin/tests/system/dyndb/driver/db.c
@@ -189,9 +189,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
        CHECK(dns__db_addrdataset(sampledb->db, node, version, now, rdataset,
                                  options, addedrdataset DNS__DB_FLARG_PASS));
        if (dns_rdatatype_isaddr(rdataset->type)) {
-               CHECK(dns_db_nodefullname(node, dns_fixedname_name(&name)));
-               CHECK(syncptrs(sampledb->inst, dns_fixedname_name(&name),
-                              rdataset, DNS_DIFFOP_ADD));
+               CHECK(syncptrs(sampledb->inst, &node->name, rdataset,
+                              DNS_DIFFOP_ADD));
        }
 
 cleanup:
@@ -217,9 +216,8 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
        }
 
        if (dns_rdatatype_isaddr(rdataset->type)) {
-               CHECK(dns_db_nodefullname(node, dns_fixedname_name(&name)));
-               CHECK(syncptrs(sampledb->inst, dns_fixedname_name(&name),
-                              rdataset, DNS_DIFFOP_DEL));
+               CHECK(syncptrs(sampledb->inst, &node->name, rdataset,
+                              DNS_DIFFOP_DEL));
        }
 
 cleanup:

diff --git a/lib/dns/db.c b/lib/dns/db.c
index bb47ce386dc46425d5c68f2d470b837bcbf6dc77..c75c250b214226ab63b90b113cbcb1c663012a52 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1072,17 +1072,6 @@ dns_db_deletedata(dns_dbnode_t *node, void *data) {
        }
 }
 
-isc_result_t
-dns_db_nodefullname(dns_dbnode_t *node, dns_name_t *name) {
-       REQUIRE(node != NULL && node->methods != NULL);
-       REQUIRE(name != NULL);
-
-       if (node->methods != NULL && node->methods->nodefullname != NULL) {
-               return node->methods->nodefullname(node, name);
-       }
-       return ISC_R_NOTIMPLEMENTED;
-}
-
 void
 dns_db_setmaxrrperset(dns_db_t *db, uint32_t value) {
        REQUIRE(DNS_DB_VALID(db));

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 6ce4daa6c5639399e0616a6533007688eec1be53..23f14030a7ef5af75142976dc885400559d70d7f 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -76,8 +76,6 @@ extern unsigned int dns_pps;
 *****/
 
 typedef struct dns_dbnode_methods {
-       isc_result_t (*nodefullname)(dns_dbnode_t *node, dns_name_t *name);
-
        void (*attachnode)(dns_dbnode_t          *source,
                           dns_dbnode_t **targetp DNS__DB_FLARG);
        void (*detachnode)(dns_dbnode_t **targetp DNS__DB_FLARG);
@@ -1764,17 +1762,6 @@ dns_db_deletedata(dns_dbnode_t *node, void *data);
  * data from an LRU list or a heap.
  */
 
-isc_result_t
-dns_db_nodefullname(dns_dbnode_t *node, dns_name_t *name);
-/*%<
- * Get the name associated with a database node.
- *
- * Requires:
- *
- * \li 'db' is a valid database
- * \li 'node' and 'name' are not NULL
- */
-
 void
 dns_db_setmaxrrperset(dns_db_t *db, uint32_t value);
 /*%<

diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index e9dda2c36bb1119023276573596e5624ed56d293..460f83085156b1061120abd3152123ed8766cf2e 100644 (file)
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -4922,18 +4922,6 @@ qpzone_deleterdataset(dns_db_t *db, dns_dbnode_t *dbnode,
        return result;
 }
 
-static isc_result_t
-nodefullname(dns_dbnode_t *node, dns_name_t *name) {
-       REQUIRE(node != NULL);
-       REQUIRE(name != NULL);
-
-       qpznode_t *qpnode = (qpznode_t *)node;
-
-       dns_name_copy(&qpnode->name, name);
-
-       return ISC_R_SUCCESS;
-}
-
 static dns_glue_t *
 new_glue(isc_mem_t *mctx, const dns_name_t *name) {
        dns_glue_t *glue = isc_mem_get(mctx, sizeof(*glue));
@@ -5302,7 +5290,6 @@ static dns_dbmethods_t qpdb_zonemethods = {
 };
 
 static dns_dbnode_methods_t qpznode_methods = (dns_dbnode_methods_t){
-       .nodefullname = nodefullname,
        .attachnode = qpzone_attachnode,
        .detachnode = qpzone_detachnode,
        .locknode = locknode,