[1144] DS and DLV cleaned up

src/lib/dns/Makefile.am

@@ -24,11 +24,11 @@ EXTRA_DIST += rdata/generic/cname_5.h
 EXTRA_DIST += rdata/generic/detail/nsec_bitmap.cc
 EXTRA_DIST += rdata/generic/detail/nsec_bitmap.h
 EXTRA_DIST += rdata/generic/detail/ds_like.h
+EXTRA_DIST += rdata/generic/dlv_32769.h
 EXTRA_DIST += rdata/generic/dname_39.cc
 EXTRA_DIST += rdata/generic/dname_39.h
 EXTRA_DIST += rdata/generic/dnskey_48.cc
 EXTRA_DIST += rdata/generic/dnskey_48.h
-EXTRA_DIST += rdata/generic/ds_43.cc
 EXTRA_DIST += rdata/generic/ds_43.h
 EXTRA_DIST += rdata/generic/mx_15.cc
 EXTRA_DIST += rdata/generic/mx_15.h

src/lib/dns/rdata/generic/detail/ds_like.h

@@ -34,7 +34,7 @@ struct DSImpl {
     const vector<uint8_t> digest_;
 };
 
-template<class RTYPE, uint16_t typeCode>class DS_LIKE : public Rdata {
+template<uint16_t typeCode>class DS_LIKE : public Rdata {
 public:
     DS_LIKE(const string& ds_str) :
 	impl_(NULL)
@@ -137,7 +137,7 @@ public:
 
     int
     compare(const Rdata& other) const {
-	const RTYPE& other_ds = dynamic_cast<const RTYPE&>(other);
+	const DS_LIKE& other_ds = dynamic_cast<const DS_LIKE&>(other);
 
 	if (impl_->tag_ != other_ds.impl_->tag_) {
 	    return (impl_->tag_ < other_ds.impl_->tag_ ? -1 : 1);

src/lib/dns/rdata/generic/dlv_32769.cc

@@ -1,51 +0,0 @@
-// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-DLV::DLV(const std::string& type_str) :
-    DS_LIKE(type_str)
-{}
-
-DLV::DLV(isc::util::InputBuffer& buffer, size_t rdata_len) :
-    DS_LIKE(buffer, rdata_len)
-{}
-
-DLV::DLV(const DLV& other) :
-    DS_LIKE(other)
-{}
-
-std::string DLV::toText() const
-{
-    return DS_LIKE::toText();
-}
-
-void DLV::toWire(isc::util::OutputBuffer& buffer) const
-{
-    DS_LIKE::toWire(buffer);
-}
-
-void DLV::toWire(AbstractMessageRenderer& renderer) const
-{
-    DS_LIKE::toWire(renderer);
-}
-
-int DLV::compare(const Rdata& other) const
-{
-    return DS_LIKE::compare(other);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE

src/lib/dns/rdata/generic/dlv_32769.h

@@ -46,12 +46,7 @@ using namespace isc::util::encode;
 
 #include <dns/rdata/generic/detail/ds_like.h>
 
-class DLV : public DS_LIKE<DLV, 32769> {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-};
+typedef DS_LIKE<32769> DLV;
 
 // END_RDATA_NAMESPACE
 // END_ISC_NAMESPACE

src/lib/dns/rdata/generic/ds_43.cc

@@ -1,51 +0,0 @@
-// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-DS::DS(const std::string& type_str) :
-    DS_LIKE(type_str)
-{}
-
-DS::DS(isc::util::InputBuffer& buffer, size_t rdata_len) :
-    DS_LIKE(buffer, rdata_len)
-{}
-
-DS::DS(const DS& other) :
-    DS_LIKE(other)
-{}
-
-std::string DS::toText() const
-{
-    return DS_LIKE::toText();
-}
-
-void DS::toWire(isc::util::OutputBuffer& buffer) const
-{
-    DS_LIKE::toWire(buffer);
-}
-
-void DS::toWire(AbstractMessageRenderer& renderer) const
-{
-    DS_LIKE::toWire(renderer);
-}
-
-int DS::compare(const Rdata& other) const
-{
-    return DS_LIKE::compare(other);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE

src/lib/dns/rdata/generic/ds_43.h

@@ -46,12 +46,7 @@ using namespace isc::util::encode;
 
 #include <dns/rdata/generic/detail/ds_like.h>
 
-class DS : public DS_LIKE<DS, 43> {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-};
+typedef DS_LIKE<43> DS;
 
 // END_RDATA_NAMESPACE
 // END_ISC_NAMESPACE