From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 5 Dec 2012 04:00:31 +0000 (-0800)
Subject: [2442] simplified interface; txt-like ctor only needs to take lexer.
X-Git-Tag: bind10-1.0.0-beta-release~39^2~3^2~1^2~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9002ffc08e7c7fba799e8b417a1d80b77a20973e;p=thirdparty%2Fkea.git

[2442] simplified interface; txt-like ctor only needs to take lexer.
---

diff --git a/src/lib/dns/rdata/generic/detail/txt_like.h b/src/lib/dns/rdata/generic/detail/txt_like.h
index 9d90f403e6..d1916e35f3 100644
--- a/src/lib/dns/rdata/generic/detail/txt_like.h
+++ b/src/lib/dns/rdata/generic/detail/txt_like.h
@@ -16,8 +16,6 @@
 #define TXT_LIKE_H 1
 
 #include <dns/master_lexer.h>
-#include <dns/master_loader.h>
-#include <dns/master_loader_callbacks.h>
 #include <dns/rdata/generic/detail/char_string.h>
 
 #include <stdint.h>
@@ -102,17 +100,12 @@ public:
 
     /// \brief Constructor using the master lexer.
     ///
-    /// This implementation only uses the \c lexer parameters; others are
-    /// ignored.
-    ///
     /// \throw CharStringTooLong the parameter string length exceeds maximum.
     /// \throw InvalidRdataText the method cannot process the parameter data
     ///
     /// \param lexer A \c MasterLexer object parsing a master file for this
     /// RDATA.
-    TXTLikeImpl(MasterLexer& lexer, const Name*, MasterLoader::Options,
-                MasterLoaderCallbacks&)
-    {
+    TXTLikeImpl(MasterLexer& lexer) {
         buildFromTextHelper(lexer);
     }
 
diff --git a/src/lib/dns/rdata/generic/spf_99.cc b/src/lib/dns/rdata/generic/spf_99.cc
index 94be9368a2..4bf24e9539 100644
--- a/src/lib/dns/rdata/generic/spf_99.cc
+++ b/src/lib/dns/rdata/generic/spf_99.cc
@@ -76,9 +76,9 @@ SPF::SPF(InputBuffer& buffer, size_t rdata_len) :
 ///
 /// \param lexer A \c MasterLexer object parsing a master file for this
 /// RDATA.
-SPF::SPF(MasterLexer& lexer, const Name* origin,
-         MasterLoader::Options options, MasterLoaderCallbacks& callbacks) :
-    impl_(new SPFImpl(lexer, origin, options, callbacks))
+SPF::SPF(MasterLexer& lexer, const Name*, MasterLoader::Options,
+         MasterLoaderCallbacks&) :
+    impl_(new SPFImpl(lexer))
 {}
 
 /// \brief Constructor from string.
diff --git a/src/lib/dns/rdata/generic/txt_16.cc b/src/lib/dns/rdata/generic/txt_16.cc
index d35b4270d8..1bd2eb1aea 100644
--- a/src/lib/dns/rdata/generic/txt_16.cc
+++ b/src/lib/dns/rdata/generic/txt_16.cc
@@ -62,9 +62,9 @@ TXT::TXT(InputBuffer& buffer, size_t rdata_len) :
 ///
 /// \param lexer A \c MasterLexer object parsing a master file for this
 /// RDATA.
-TXT::TXT(MasterLexer& lexer, const Name* origin,
-         MasterLoader::Options options, MasterLoaderCallbacks& callbacks) :
-    impl_(new TXTImpl(lexer, origin, options, callbacks))
+TXT::TXT(MasterLexer& lexer, const Name*, MasterLoader::Options,
+         MasterLoaderCallbacks&) :
+    impl_(new TXTImpl(lexer))
 {}
 
 TXT::TXT(const std::string& txtstr) :