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

[BIND 10 source code commits]

Author: jinmei
Date: Fri Jan 29 19:37:32 2010
New Revision: 646

Log:
constified things whenever possible

Modified:
    experiments/each-query/src/lib/auth/cpp/data_source.h
    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.h
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source.h (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source.h Fri Jan 29 19:37:32 2010
@@ -49,23 +49,23 @@
                                const RRClass& qclass,
                                const RRType& qtype,
                                RRsetList& target,
-                               RRsetList& sigs) = 0;
+                               RRsetList& sigs) const = 0;
 
     virtual DSResult findRRset(const Name& qname,
                                const RRClass& qclass,
                                const RRType& qtype,
-                               RRsetList& target) = 0;
+                               RRsetList& target) const = 0;
 
-    virtual DataSrc* findClosestEnclosure(const Name& qname,
-                                          Name& container) = 0;
+    virtual const DataSrc* findClosestEnclosure(const Name& qname,
+                                                Name& container) const = 0;
 
     // Optional 'low-level' methods.  These will have stub implementations
     // in the general DataSrc class but MAY be overwritten by subclasses
     virtual DSResult init() = 0;
     virtual DSResult close() = 0;
 
-    virtual RRClass& getClass() = 0;
-    virtual RRClass& setClass() = 0;
+    virtual const RRClass& getClass() const = 0;
+    virtual const RRClass& setClass() const = 0;
 };
 
 // Base class for a DNS Data Source
@@ -88,10 +88,10 @@
                                const RRType& qtype,
                                RRsetList& target) = 0;
 
-    virtual DataSrc* findClosestEnclosure(const Name& qname,
-                                            Name& container) = 0;
+    virtual const DataSrc* findClosestEnclosure(const Name& qname,
+                                                Name& container) const = 0;
 
-    RRClass& getClass() { return rrclass; }
+    const RRClass& getClass() const { return rrclass; }
     void setClass(RRClass& c) { rrclass = c; }
 
     DSResult init() { return NOT_IMPLEMENTED; }
@@ -115,10 +115,12 @@
         data_sources.push_back(ds);
     };
 
-    DataSrc* findClosestEnclosure(const Name& qname, Name& container) {
-        DataSrc* best = NULL;
+    const DataSrc* findClosestEnclosure(const Name& qname,
+                                        Name& container) const
+    {
+        const DataSrc* best = NULL;
         BOOST_FOREACH (DataSrc* ds, data_sources) {
-            DataSrc* source;
+            const DataSrc* source;
             DSResult result;
 
             if (getClass() != RRClass::ANY() && ds->getClass() != getClass()) {
@@ -142,3 +144,7 @@
 }
 
 #endif
+
+// Local Variables: 
+// mode: c++
+// End: 

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 19:37:32 2010
@@ -29,8 +29,8 @@
     version->addRdata(rdata::generic::TXT("BIND10 0.0.0 (pre-alpha)"));
 }
 
-DataSrc*
-StaticDataSrc::findClosestEnclosure(const Name& qname, Name& container) {
+const DataSrc*
+StaticDataSrc::findClosestEnclosure(const Name& qname, Name& container) const {
     NameComparisonResult::NameRelation version_cmp = qname.compare(version_name).getRelation();
     if (version_cmp == NameComparisonResult::EQUAL ||
         version_cmp == NameComparisonResult::SUBDOMAIN) {
@@ -50,7 +50,7 @@
 StaticDataSrc::findRRset(const Name& qname,
                          const RRClass& qclass,
                          const RRType& qtype,
-                         RRsetList& target, RRset& sigs)
+                         RRsetList& target, RRset& sigs) const
 {
     if (qname == version_name) {
         target.push_back(version);

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 19:37:32 2010
@@ -35,20 +35,20 @@
     StaticDataSrc();
     ~StaticDataSrc() {};
 
-    DataSrc* findClosestEnclosure(const Name& qname,
-                                  Name& container);
+    const DataSrc* findClosestEnclosure(const Name& qname,
+                                        Name& container) const;
 
     DSResult findRRset(const Name& qname,
                        const RRClass& qclass,
                        const RRType& qtype,
-                       RRsetList& target, RRset& sigs);
+                       RRsetList& target, RRset& sigs) const;
 
     DSResult init() { return SUCCESS; };
     DSResult close() { return SUCCESS; } ;
 
 private:
-    Name authors_name;
-    Name version_name;
+    const Name authors_name;
+    const Name version_name;
     RRsetPtr authors;
     RRsetPtr version;
 };
@@ -57,3 +57,7 @@
 }
 
 #endif
+
+// Local Variables: 
+// mode: c++
+// End: