BIND 10 trac1144, updated. a03d7d9aae8ac258d266c66c62c63e03ff5d2558 [1144] DS and DLV cleaned up
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Aug 10 11:19:57 UTC 2011
The branch, trac1144 has been updated
via a03d7d9aae8ac258d266c66c62c63e03ff5d2558 (commit)
from d14895917e4841ee53c46f7ab3f46c3f19489069 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a03d7d9aae8ac258d266c66c62c63e03ff5d2558
Author: Dima Volodin <dvv at isc.org>
Date: Tue Aug 9 21:26:24 2011 -0400
[1144] DS and DLV cleaned up
-----------------------------------------------------------------------
Summary of changes:
src/lib/dns/Makefile.am | 2 +-
src/lib/dns/rdata/generic/detail/ds_like.h | 4 +-
src/lib/dns/rdata/generic/dlv_32769.cc | 51 ----------------------------
src/lib/dns/rdata/generic/dlv_32769.h | 7 +---
src/lib/dns/rdata/generic/ds_43.cc | 51 ----------------------------
src/lib/dns/rdata/generic/ds_43.h | 7 +---
6 files changed, 5 insertions(+), 117 deletions(-)
delete mode 100644 src/lib/dns/rdata/generic/dlv_32769.cc
delete mode 100644 src/lib/dns/rdata/generic/ds_43.cc
-----------------------------------------------------------------------
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 88242bc..a8bcb72 100644
--- a/src/lib/dns/Makefile.am
+++ b/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
diff --git a/src/lib/dns/rdata/generic/detail/ds_like.h b/src/lib/dns/rdata/generic/detail/ds_like.h
index 8d4c5b2..3ed190f 100644
--- a/src/lib/dns/rdata/generic/detail/ds_like.h
+++ b/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);
diff --git a/src/lib/dns/rdata/generic/dlv_32769.cc b/src/lib/dns/rdata/generic/dlv_32769.cc
deleted file mode 100644
index d00282f..0000000
--- a/src/lib/dns/rdata/generic/dlv_32769.cc
+++ /dev/null
@@ -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
diff --git a/src/lib/dns/rdata/generic/dlv_32769.h b/src/lib/dns/rdata/generic/dlv_32769.h
index cf86234..f1d2761 100644
--- a/src/lib/dns/rdata/generic/dlv_32769.h
+++ b/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
diff --git a/src/lib/dns/rdata/generic/ds_43.cc b/src/lib/dns/rdata/generic/ds_43.cc
deleted file mode 100644
index fe73e52..0000000
--- a/src/lib/dns/rdata/generic/ds_43.cc
+++ /dev/null
@@ -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
diff --git a/src/lib/dns/rdata/generic/ds_43.h b/src/lib/dns/rdata/generic/ds_43.h
index 24715d9..eae22cb 100644
--- a/src/lib/dns/rdata/generic/ds_43.h
+++ b/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
More information about the bind10-changes
mailing list