BIND 10 trac2751, updated. 8e64776206cf6845c938ddfb1ad76c7d6a61377e [2751] Make some minor comment updates
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Sep 5 12:37:27 UTC 2013
The branch, trac2751 has been updated
via 8e64776206cf6845c938ddfb1ad76c7d6a61377e (commit)
via 3d4ea5002959fd0510241f2c3550e90d9899fcee (commit)
via 06091ef843f52f38d0d13eb58bd1400f637ee96b (commit)
from c812d223a1a93535f29ede6a082ea96fc1f928fc (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 8e64776206cf6845c938ddfb1ad76c7d6a61377e
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Sep 5 18:07:07 2013 +0530
[2751] Make some minor comment updates
commit 3d4ea5002959fd0510241f2c3550e90d9899fcee
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Sep 5 18:06:34 2013 +0530
[2751] Fix a typo
(Yes, it's "an" and not "a" here as the syllable begins with a vowel.)
commit 06091ef843f52f38d0d13eb58bd1400f637ee96b
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Sep 5 18:05:49 2013 +0530
[2751] Re-indent code
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/memory/rdataset.cc | 8 ++++----
src/lib/datasrc/memory/rdataset.h | 9 +++++----
src/lib/datasrc/tests/memory/rdataset_unittest.cc | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/rdataset.cc b/src/lib/datasrc/memory/rdataset.cc
index baf948e..5314077 100644
--- a/src/lib/datasrc/memory/rdataset.cc
+++ b/src/lib/datasrc/memory/rdataset.cc
@@ -200,10 +200,10 @@ void writeData(util::OutputBuffer* buffer, const void* data, size_t len) {
}
size_t subtractIterate(const dns::ConstRRsetPtr& subtract,
- const RRClass& rrclass, const RRType& rrtype,
- boost::function<bool ()> iterator,
- boost::function<void (const Rdata& rdata)> inserter,
- util::OutputBuffer& buffer)
+ const RRClass& rrclass, const RRType& rrtype,
+ boost::function<bool ()> iterator,
+ boost::function<void (const Rdata& rdata)> inserter,
+ util::OutputBuffer& buffer)
{
size_t count = 0;
while (iterator()) {
diff --git a/src/lib/datasrc/memory/rdataset.h b/src/lib/datasrc/memory/rdataset.h
index 15811d6..b347a33 100644
--- a/src/lib/datasrc/memory/rdataset.h
+++ b/src/lib/datasrc/memory/rdataset.h
@@ -207,7 +207,7 @@ public:
dns::ConstRRsetPtr sig_rrset,
const RdataSet* old_rdataset = NULL);
- /// \brief Subtract some RDATAs and RRSIGs from aw RdataSet
+ /// \brief Subtract some RDATAs and RRSIGs from an RdataSet
///
/// Allocate and construct a new RdataSet that contains all the
/// data from the \c old_rdataset except for the ones in rrset
@@ -229,7 +229,8 @@ public:
/// even when subtracting data from the old_rdataset, since a new
/// copy is being created.
///
- /// The old_rdataset is not destroyed and it is up to the caller.
+ /// The old_rdataset is not destroyed and it is up to the caller to
+ /// manage its allocation.
///
/// \throw util::MemorySegmentGrown The memory segment has grown, possibly
/// relocating data.
@@ -239,8 +240,8 @@ public:
/// \param mem_sgmt A \c MemorySegment from which memory for the new
/// \c RdataSet is allocated.
/// \param encoder The RDATA encoder to encode \c rrset and \c sig_rrset
- /// with the \c RdataSet to be created.
- /// \param rrset A (non RRSIG) RRset containing the RDATA that are not
+ /// with the \c RdataSet is to be created.
+ /// \param rrset A (non-RRSIG) RRset containing the RDATA that are not
/// to be present in the result. Can be NULL if sig_rrset is not.
/// \param sig_rrset An RRSIG RRset containing the RRSIGs that are not
/// to be present in the result. Can be NULL if rrset is not.
diff --git a/src/lib/datasrc/tests/memory/rdataset_unittest.cc b/src/lib/datasrc/tests/memory/rdataset_unittest.cc
index f4b2bf6..a531fcc 100644
--- a/src/lib/datasrc/tests/memory/rdataset_unittest.cc
+++ b/src/lib/datasrc/tests/memory/rdataset_unittest.cc
@@ -269,7 +269,7 @@ TEST_F(RdataSetTest, subtract) {
holder1.set(RdataSet::create(mem_sgmt_, encoder_,
(i & 1) ? a_rrsets : null_rrset,
(i & 2) ? rrsig_rrsets : null_rrset));
- // Create merged rdataset, based on the old one and RRsets
+ // Create subtracted rdataset, from the old one and RRsets
SegmentObjectHolder<RdataSet, RRClass> holder2(mem_sgmt_, rrclass);
holder2.set(RdataSet::subtract(mem_sgmt_, encoder_,
(j & 1) ? a_rrsets_rm : null_rrset,
More information about the bind10-changes
mailing list