[2268] Rename load method to loadInternal()

diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index d6b280311ff6a99c15e62c4f763f96f2a5afc4aa..fb37cca7d467d0b4cad25fb974291e47c70fcc05 100644 (file)
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -83,10 +83,10 @@ InMemoryClient::~InMemoryClient() {
 }
 
 result::Result
-InMemoryClient::load(const Name& zone_name,
-                     const string& filename,
-                     boost::function<void(internal::LoadCallback)>
-                         rrset_installer)
+InMemoryClient::loadInternal(const Name& zone_name,
+                             const string& filename,
+                             boost::function<void(internal::LoadCallback)>
+                             rrset_installer)
 {
     SegmentObjectHolder<ZoneData, RRClass> holder(
         mem_sgmt_, ZoneData::create(mem_sgmt_, zone_name), rrclass_);
@@ -214,17 +214,17 @@ InMemoryClient::load(const isc::dns::Name& zone_name,
     LOG_DEBUG(logger, DBG_TRACE_BASIC, DATASRC_MEMORY_MEM_LOAD).arg(zone_name).
         arg(filename);
 
-    return (load(zone_name, filename,
-                 boost::bind(masterLoadWrapper, filename.c_str(),
-                             zone_name, getClass(), _1)));
+    return (loadInternal(zone_name, filename,
+                         boost::bind(masterLoadWrapper, filename.c_str(),
+                                     zone_name, getClass(), _1)));
 }
 
 result::Result
 InMemoryClient::load(const isc::dns::Name& zone_name,
                      ZoneIterator& iterator) {
-    return (load(zone_name, string(),
-                 boost::bind(generateRRsetFromIterator,
-                             &iterator, _1)));
+    return (loadInternal(zone_name, string(),
+                         boost::bind(generateRRsetFromIterator,
+                                     &iterator, _1)));
 }
 
 const std::string

diff --git a/src/lib/datasrc/memory/memory_client.h b/src/lib/datasrc/memory/memory_client.h
index 9b3113e406e86cb6cac3900e8e0019eeeee9ddaa..1a17613331f19698e1f086221c5e35377f9fc50a 100644 (file)
--- a/src/lib/datasrc/memory/memory_client.h
+++ b/src/lib/datasrc/memory/memory_client.h
@@ -208,10 +208,10 @@ private:
     // another data source.
     // filename is the file name of the master file or empty if the zone is
     // loaded from another data source.
-    result::Result load(const isc::dns::Name& zone_name,
-                        const std::string& filename,
-                        boost::function<void(internal::LoadCallback)>
-                            rrset_installer);
+    result::Result loadInternal(const isc::dns::Name& zone_name,
+                               const std::string& filename,
+                               boost::function<void(internal::LoadCallback)>
+                               rrset_installer);
 
     util::MemorySegment& mem_sgmt_;
     const isc::dns::RRClass rrclass_;