[svn] commit: r639 - in /experiments/each-query/src/lib/auth/cpp: data_source_static.cc data_source_static.h

[BIND 10 source code commits]

Author: jelte
Date: Fri Jan 29 18:35:05 2010
New Revision: 639

Log:
small improvement in readability
use this as return from findClosestEnclosure for now (or NULL if none found)

Modified:
    experiments/each-query/src/lib/auth/cpp/data_source_static.cc
    experiments/each-query/src/lib/auth/cpp/data_source_static.h

Modified: experiments/each-query/src/lib/auth/cpp/data_source_static.cc
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source_static.cc (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source_static.cc Fri Jan 29 18:35:05 2010
@@ -7,7 +7,7 @@
 namespace isc {
 namespace dns {
 
-StaticDataSource::StaticDataSource() : authors_name("authors.bind"),
+StaticDataSrc::StaticDataSrc() : authors_name("authors.bind"),
                                        version_name("version.bind")
 {
     authors = RRsetPtr(new RRset(authors_name, RRClass::CH(),
@@ -29,35 +29,35 @@
     version->addRdata(rdata::generic::TXT("BIND10 0.0.0 (beta)"));
 }
 
-DSResult
-StaticDataSource::findClosestEnclosure(const Name& qname,
+DataSrc
+StaticDataSrc::findClosestEnclosure(const Name& qname,
                                        Name& container)
 {
     NameComparisonResult::NameRelation version_cmp = qname.compare(version_name).getRelation();
     if (version_cmp == NameComparisonResult::EQUAL ||
         version_cmp == NameComparisonResult::SUBDOMAIN) {
         container = version_name;
-        return SUCCESS;
+        return this;
     }
     NameComparisonResult::NameRelation authors_cmp = qname.compare(authors_name).getRelation();
     if (authors_cmp == NameComparisonResult::EQUAL ||
         authors_cmp == NameComparisonResult::SUBDOMAIN) {
         container = authors_name;
-        return SUCCESS;
+        return this;
     }
-    return ZONE_NOT_FOUND;
+    return NULL;
 }
 
 DSResult
-StaticDataSource::findRRset(const Name& qname,
-                            const RRClass& qclass,
-                            const RRType& qtype,
-                            RRsetList& target, RRset& sigs)
+StaticDataSrc::findRRset(const Name& qname,
+                         const RRClass& qclass,
+                         const RRType& qtype,
+                         RRsetList& target, RRset& sigs)
 {
-    if (qname.compare(version_name).getRelation() == NameComparisonResult::EQUAL) {
+    if (qname == version_name) {
         target.push_back(version);
         return SUCCESS;
-    } else if (qname.compare(authors_name).getRelation() == NameComparisonResult::EQUAL) {
+    } else if (qname == authors_name) {
         target.push_back(authors);
         return SUCCESS;
     }

Modified: experiments/each-query/src/lib/auth/cpp/data_source_static.h
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source_static.h (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source_static.h Fri Jan 29 18:35:05 2010
@@ -30,12 +30,12 @@
 namespace isc {
 namespace dns {
 
-class StaticDataSource : public DataSource {
+class StaticDataSrc : public DataSrc {
 public:
-    StaticDataSource();
-    ~StaticDataSource() {};
+    StaticDataSrc();
+    ~StaticDataSrc() {};
 
-    DSResult findClosestEnclosure(const Name& qname,
+    DataSrc* findClosestEnclosure(const Name& qname,
                                   Name& container);
 
     DSResult findRRset(const Name& qname,