Parcourir la source

Changed "ds" suffix to "datasrc" to avoid confusion with DS rdatatype,
per suggestions from bind10 channel discussion


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1264 e5f2f494-b856-4b98-b285-d166d9295462

Evan Hunt il y a 15 ans
Parent
commit
48cd762dc2

+ 2 - 2
src/bin/auth/auth_srv.cc

@@ -37,8 +37,8 @@
 
 #include <auth/query.h>
 #include <auth/data_source.h>
-#include <auth/static_ds.h>
-#include <auth/sqlite3_ds.h>
+#include <auth/static_datasrc.h>
+#include <auth/sqlite3_datasrc.h>
 
 #include <cc/data.h>
 

+ 2 - 2
src/lib/auth/Makefile.am

@@ -6,6 +6,6 @@ CLEANFILES = *.gcno *.gcda
 
 lib_LTLIBRARIES = libauth.la
 libauth_la_SOURCES = data_source.h data_source.cc
-libauth_la_SOURCES += static_ds.h static_ds.cc
-libauth_la_SOURCES += sqlite3_ds.h sqlite3_ds.cc
+libauth_la_SOURCES += static_datasrc.h static_datasrc.cc
+libauth_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
 libauth_la_SOURCES += query.h query.cc

+ 1 - 1
src/lib/auth/sqlite3_ds.cc

@@ -17,7 +17,7 @@
 #include <string>
 #include <sstream>
 
-#include "sqlite3_ds.h"
+#include "sqlite3_datasrc.h"
 
 #include <dns/rrttl.h>
 #include <dns/rdata.h>

src/lib/auth/sqlite3_ds.h → src/lib/auth/sqlite3_datasrc.h


+ 1 - 1
src/lib/auth/static_ds.cc

@@ -23,7 +23,7 @@
 #include <dns/rrttl.h>
 
 #include "data_source.h"
-#include "static_ds.h"
+#include "static_datasrc.h"
 
 using namespace std;
 using namespace isc::dns;

src/lib/auth/static_ds.h → src/lib/auth/static_datasrc.h


+ 3 - 3
src/lib/auth/tests/Makefile.am

@@ -8,9 +8,9 @@ TESTS += run_unittests
 run_unittests_SOURCES = run_unittests.cc
 run_unittests_SOURCES += unittest_util.h unittest_util.cc
 run_unittests_SOURCES += datasrc_unittest.cc
-run_unittests_SOURCES += sqlite3_ds_unittest.cc
-run_unittests_SOURCES += static_ds_unittest.cc
-run_unittests_SOURCES += test_ds.h test_ds.cc
+run_unittests_SOURCES += sqlite3_unittest.cc
+run_unittests_SOURCES += static_unittest.cc
+run_unittests_SOURCES += test_datasrc.h test_datasrc.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(GTEST_LDADD)

+ 1 - 1
src/lib/auth/tests/datasrc_unittest.cc

@@ -33,7 +33,7 @@
 
 #include <auth/query.h>
 #include "unittest_util.h"
-#include "test_ds.h"
+#include "test_datasrc.h"
 
 using isc::UnitTestUtil;
 using namespace std;

+ 1 - 1
src/lib/auth/tests/sqlite3_ds_unittest.cc

@@ -33,7 +33,7 @@
 
 #include <auth/query.h>
 #include <auth/data_source.h>
-#include <auth/sqlite3_ds.h>
+#include <auth/sqlite3_datasrc.h>
 
 using namespace std;
 using namespace isc::dns;

+ 1 - 1
src/lib/auth/tests/static_ds_unittest.cc

@@ -31,7 +31,7 @@
 
 #include <auth/query.h>
 #include <auth/data_source.h>
-#include <auth/static_ds.h>
+#include <auth/static_datasrc.h>
 
 using namespace std;
 using namespace isc::dns;

+ 1 - 1
src/lib/auth/tests/test_ds.cc

@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "unittest_util.h"
-#include "test_ds.h"
+#include "test_datasrc.h"
 
 #include <auth/data_source.h>
 

src/lib/auth/tests/test_ds.h → src/lib/auth/tests/test_datasrc.h