From: Michal 'vorner' Vaner Date: Wed, 21 Nov 2012 12:10:06 +0000 (+0100) Subject: [2376] Rename loader_callbacks to master_loader_callbacks X-Git-Tag: bind10-1.0.0-beta-release~84^2~4^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc964cd262f9fb09d7e83b71bf5c5fbb0cb13578;p=thirdparty%2Fkea.git [2376] Rename loader_callbacks to master_loader_callbacks --- diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am index 53ffd06d8f..dcf774e32a 100644 --- 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 9759009eed..c7f31a571d 100644 --- 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 +#include #include #include 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 0f074e8883..753e66b829 100644 --- 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 +#include namespace isc { namespace datasrc { diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am index c265f2ee9e..7cdf0ee4f5 100644 --- 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 28377b905b..91f69de1c7 100644 --- 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 +#include #include #include diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am index 4d7cadf1fe..c101d774ae 100644 --- 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 93743c2e10..d43174c0c2 100644 --- 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 diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am index e88d060d26..12f8f2fef4 100644 --- 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 f2686d08bf..6f2afeb117 100644 --- 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 +#include #include #include #include