[2376] Rename loader_callbacks to master_loader_callbacks

diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index 53ffd06d8f398f2c36804cf7356a54534496e20b..dcf774e32a4c6dead75e33c5405330ef9ec95d88 100644 (file)
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -35,7 +35,8 @@ libb10_datasrc_la_SOURCES += database.h database.cc
 libb10_datasrc_la_SOURCES += factory.h factory.cc
 libb10_datasrc_la_SOURCES += client_list.h client_list.cc
 libb10_datasrc_la_SOURCES += memory_datasrc.h memory_datasrc.cc
-libb10_datasrc_la_SOURCES += loader_callbacks.h loader_callbacks.cc
+libb10_datasrc_la_SOURCES += master_loader_callbacks.h
+libb10_datasrc_la_SOURCES += master_loader_callbacks.cc
 nodist_libb10_datasrc_la_SOURCES = datasrc_messages.h datasrc_messages.cc
 libb10_datasrc_la_LDFLAGS = -no-undefined -version-info 1:0:1
 

diff --git a/src/lib/datasrc/loader_callbacks.cc b/src/lib/datasrc/master_loader_callbacks.cc
similarity index 98%
rename from src/lib/datasrc/loader_callbacks.cc
rename to src/lib/datasrc/master_loader_callbacks.cc
index 9759009eed4a7340b91032f51357f8f7e91bf026..c7f31a571d14773eb258ff2be131432b0d412057 100644 (file)
--- a/src/lib/datasrc/loader_callbacks.cc
+++ b/src/lib/datasrc/master_loader_callbacks.cc
@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <datasrc/loader_callbacks.h>
+#include <datasrc/master_loader_callbacks.h>
 #include <datasrc/zone.h>
 #include <datasrc/logger.h>
 

diff --git a/src/lib/datasrc/loader_callbacks.h b/src/lib/datasrc/master_loader_callbacks.h
similarity index 94%
rename from src/lib/datasrc/loader_callbacks.h
rename to src/lib/datasrc/master_loader_callbacks.h
index 0f074e8883ca17ccd7d0e2355a2a0cbf4829b173..753e66b8295dec9325c50e915ffa517458bec3f4 100644 (file)
--- a/src/lib/datasrc/loader_callbacks.h
+++ b/src/lib/datasrc/master_loader_callbacks.h
@@ -12,10 +12,10 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef DATASRC_LOADER_CALLBACKS_H
-#define DATASRC_LOADER_CALLBACKS_H
+#ifndef DATASRC_MASTER_LOADER_CALLBACKS_H
+#define DATASRC_MASTER_LOADER_CALLBACKS_H
 
-#include <dns/loader_callbacks.h>
+#include <dns/master_loader_callbacks.h>
 
 namespace isc {
 namespace datasrc {

diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index c265f2ee9e3d3809740b011a16f2cb2f3774888b..7cdf0ee4f5337ec1c245953745f9c56587fe1339 100644 (file)
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -59,7 +59,7 @@ run_unittests_SOURCES += zonetable_unittest.cc
 run_unittests_SOURCES += zone_finder_context_unittest.cc
 run_unittests_SOURCES += faked_nsec3.h faked_nsec3.cc
 run_unittests_SOURCES += client_list_unittest.cc
-run_unittests_SOURCES += loader_callbacks_test.cc
+run_unittests_SOURCES += master_loader_callbacks_test.cc
 
 # We need the actual module implementation in the tests (they are not part
 # of libdatasrc)

diff --git a/src/lib/datasrc/tests/loader_callbacks_test.cc b/src/lib/datasrc/tests/master_loader_callbacks_test.cc
similarity index 99%
rename from src/lib/datasrc/tests/loader_callbacks_test.cc
rename to src/lib/datasrc/tests/master_loader_callbacks_test.cc
index 28377b905b4b40c0d7ede5d8e180f4f3ba92605e..91f69de1c75c9dedbf40b84490d191b5f80a27bc 100644 (file)
--- a/src/lib/datasrc/tests/loader_callbacks_test.cc
+++ b/src/lib/datasrc/tests/master_loader_callbacks_test.cc
@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <datasrc/loader_callbacks.h>
+#include <datasrc/master_loader_callbacks.h>
 #include <datasrc/zone.h>
 
 #include <dns/rrset.h>

diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 4d7cadf1fe271d3fdd17a0e79100122cd424adfd..c101d774ae1b36c32e3dea8db74e690fcdc984cc 100644 (file)
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -119,7 +119,7 @@ libb10_dns___la_SOURCES += tsigerror.h tsigerror.cc
 libb10_dns___la_SOURCES += tsigkey.h tsigkey.cc
 libb10_dns___la_SOURCES += tsigrecord.h tsigrecord.cc
 libb10_dns___la_SOURCES += character_string.h character_string.cc
-libb10_dns___la_SOURCES += loader_callbacks.h
+libb10_dns___la_SOURCES += master_loader_callbacks.h
 libb10_dns___la_SOURCES += rdata/generic/detail/nsec_bitmap.h
 libb10_dns___la_SOURCES += rdata/generic/detail/nsec_bitmap.cc
 libb10_dns___la_SOURCES += rdata/generic/detail/nsec3param_common.cc

diff --git a/src/lib/dns/loader_callbacks.h b/src/lib/dns/master_loader_callbacks.h
similarity index 98%
rename from src/lib/dns/loader_callbacks.h
rename to src/lib/dns/master_loader_callbacks.h
index 93743c2e10b0bce1819ceacfc0bc16e9b42fa707..d43174c0c2743004cfb3c66254b4692484df6d70 100644 (file)
--- a/src/lib/dns/loader_callbacks.h
+++ b/src/lib/dns/master_loader_callbacks.h
@@ -12,8 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef LOADER_CALLBACKS_H
-#define LOADER_CALLBACKS_H
+#ifndef MASTER_LOADER_CALLBACKS_H
+#define MASTER_LOADER_CALLBACKS_H
 
 #include <dns/rrset.h>
 

diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am
index e88d060d260c070fba9ccc4bf60f2f77b800fa0c..12f8f2fef4446666837672f6f0df02850ee52b64 100644 (file)
--- a/src/lib/dns/tests/Makefile.am
+++ b/src/lib/dns/tests/Makefile.am
@@ -71,7 +71,7 @@ run_unittests_SOURCES += tsigerror_unittest.cc
 run_unittests_SOURCES += tsigkey_unittest.cc
 run_unittests_SOURCES += tsigrecord_unittest.cc
 run_unittests_SOURCES += character_string_unittest.cc
-run_unittests_SOURCES += loader_callbacks_test.cc
+run_unittests_SOURCES += master_loader_callbacks_test.cc
 run_unittests_SOURCES += run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 # We shouldn't need to include BOTAN_LIBS here, but there

diff --git a/src/lib/dns/tests/loader_callbacks_test.cc b/src/lib/dns/tests/master_loader_callbacks_test.cc
similarity index 98%
rename from src/lib/dns/tests/loader_callbacks_test.cc
rename to src/lib/dns/tests/master_loader_callbacks_test.cc
index f2686d08bf9d37ff34a1e9352e15c3052a6a8248..6f2afeb11753808393b64dd150c66076484f3d6f 100644 (file)
--- a/src/lib/dns/tests/loader_callbacks_test.cc
+++ b/src/lib/dns/tests/master_loader_callbacks_test.cc
@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <dns/loader_callbacks.h>
+#include <dns/master_loader_callbacks.h>
 #include <dns/name.h>
 #include <dns/rrttl.h>
 #include <dns/rrclass.h>