BIND 10 master, updated. aafa7f654275feaec7258b8434dd845f8400da8a Merge branch 'trac3312'
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Feb 5 07:02:14 UTC 2014
The branch, master has been updated
via aafa7f654275feaec7258b8434dd845f8400da8a (commit)
via 6f07eddae79a4d7afae38bbd514054a26c8da5e1 (commit)
via 5c806a27410b36452daa82dace047579cf42d3c2 (commit)
via bbee45a49834b3e89a9afaf05acd98f1b6b3b76e (commit)
via c415976948d86aac316937f70a46192c4d079da6 (commit)
from 469f80fa1e994479c42898cffb88595cd3ba9185 (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 aafa7f654275feaec7258b8434dd845f8400da8a
Merge: 469f80f 6f07edd
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Feb 5 12:21:58 2014 +0530
Merge branch 'trac3312'
-----------------------------------------------------------------------
Summary of changes:
src/bin/d2/tests/nc_trans_unittests.cc | 2 +-
src/lib/acl/ip_check.cc | 2 +-
src/lib/datasrc/memory/zone_data_loader.cc | 2 +-
src/lib/datasrc/memory/zone_data_updater.h | 2 +-
src/lib/datasrc/tests/database_unittest.cc | 8 ++++----
src/lib/dns/python/rdata_python.cc | 4 ++--
src/lib/dns/python/rrset_python.cc | 2 +-
src/lib/log/message_dictionary.cc | 10 +++++-----
src/lib/resolve/tests/recursive_query_unittest.cc | 2 --
9 files changed, 16 insertions(+), 18 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/d2/tests/nc_trans_unittests.cc b/src/bin/d2/tests/nc_trans_unittests.cc
index 010d197..a62d0ae 100644
--- a/src/bin/d2/tests/nc_trans_unittests.cc
+++ b/src/bin/d2/tests/nc_trans_unittests.cc
@@ -326,8 +326,8 @@ public:
ASSERT_EQ(NameChangeTransaction::NOP_EVT,
name_change->getNextEvent());
- int cnt = 0;
while (name_change->getNextEvent() == NameChangeTransaction::NOP_EVT) {
+ int cnt = 0;
ASSERT_NO_THROW(cnt = runTimedIO(run_time));
if (cnt == 0) {
FAIL() << "IO Service stopped unexpectedly";
diff --git a/src/lib/acl/ip_check.cc b/src/lib/acl/ip_check.cc
index 7192064..c1f590f 100644
--- a/src/lib/acl/ip_check.cc
+++ b/src/lib/acl/ip_check.cc
@@ -115,7 +115,7 @@ namespace {
const uint8_t*
getSockAddrData(const struct sockaddr& sa) {
const void* sa_ptr = &sa;
- const void* data_ptr;
+ const void* data_ptr = NULL;
if (sa.sa_family == AF_INET) {
const struct sockaddr_in* sin =
static_cast<const struct sockaddr_in*>(sa_ptr);
diff --git a/src/lib/datasrc/memory/zone_data_loader.cc b/src/lib/datasrc/memory/zone_data_loader.cc
index e796dd4..ddf6a19 100644
--- a/src/lib/datasrc/memory/zone_data_loader.cc
+++ b/src/lib/datasrc/memory/zone_data_loader.cc
@@ -69,7 +69,7 @@ typedef boost::function<void(isc::dns::ConstRRsetPtr)> LoadCallback;
class ZoneDataLoader : boost::noncopyable {
public:
ZoneDataLoader(util::MemorySegment& mem_sgmt,
- const isc::dns::RRClass rrclass,
+ const isc::dns::RRClass& rrclass,
const isc::dns::Name& zone_name, ZoneData& zone_data) :
updater_(mem_sgmt, rrclass, zone_name, zone_data)
{}
diff --git a/src/lib/datasrc/memory/zone_data_updater.h b/src/lib/datasrc/memory/zone_data_updater.h
index e8826bd..5a45be4 100644
--- a/src/lib/datasrc/memory/zone_data_updater.h
+++ b/src/lib/datasrc/memory/zone_data_updater.h
@@ -67,7 +67,7 @@ public:
/// on the given memory segment. Currently, at most one zone data
/// updater may exist on the same memory segment.
ZoneDataUpdater(util::MemorySegment& mem_sgmt,
- isc::dns::RRClass rrclass,
+ const isc::dns::RRClass& rrclass,
const isc::dns::Name& zone_name,
ZoneData& zone_data) :
mem_sgmt_(mem_sgmt),
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 19d664f..17bf7ba 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -1683,7 +1683,7 @@ findTestCommon(ZoneFinder& finder, const isc::dns::Name& name,
const isc::dns::RRType& type,
ConstZoneFinderContextPtr actual_result,
const isc::dns::RRType& expected_type,
- const isc::dns::RRTTL expected_ttl,
+ const isc::dns::RRTTL& expected_ttl,
ZoneFinder::Result expected_result,
const std::vector<string>& expected_rdatas,
const std::vector<string>& expected_sig_rdatas,
@@ -1737,7 +1737,7 @@ doFindTest(ZoneFinder& finder,
const isc::dns::Name& name,
const isc::dns::RRType& type,
const isc::dns::RRType& expected_type,
- const isc::dns::RRTTL expected_ttl,
+ const isc::dns::RRTTL& expected_ttl,
ZoneFinder::Result expected_result,
const std::vector<std::string>& expected_rdatas,
const std::vector<std::string>& expected_sig_rdatas,
@@ -1758,7 +1758,7 @@ doFindAtOriginTest(ZoneFinder& finder,
const isc::dns::Name& origin,
const isc::dns::RRType& type,
const isc::dns::RRType& expected_type,
- const isc::dns::RRTTL expected_ttl,
+ const isc::dns::RRTTL& expected_ttl,
ZoneFinder::Result expected_result,
const std::vector<std::string>& expected_rdatas,
const std::vector<std::string>& expected_sig_rdatas,
@@ -1781,7 +1781,7 @@ doFindAtOriginTest(ZoneFinder& finder,
void
doFindAllTestResult(ZoneFinder& finder, const isc::dns::Name& name,
ZoneFinder::Result expected_result,
- const isc::dns::RRType expected_type,
+ const isc::dns::RRType& expected_type,
std::vector<std::string> expected_rdata,
const isc::dns::Name& expected_name =
isc::dns::Name::ROOT_NAME(),
diff --git a/src/lib/dns/python/rdata_python.cc b/src/lib/dns/python/rdata_python.cc
index 20f67c8..682a168 100644
--- a/src/lib/dns/python/rdata_python.cc
+++ b/src/lib/dns/python/rdata_python.cc
@@ -104,9 +104,9 @@ Rdata_init(PyObject* self_p, PyObject* args, PyObject*) {
const char* s;
const char* data;
Py_ssize_t len;
- s_Rdata* self(static_cast<s_Rdata*>(self_p));
-
try {
+ s_Rdata* self = static_cast<s_Rdata*>(self_p);
+
// Create from string
if (PyArg_ParseTuple(args, "O!O!s", &rrtype_type, &rrtype,
&rrclass_type, &rrclass,
diff --git a/src/lib/dns/python/rrset_python.cc b/src/lib/dns/python/rrset_python.cc
index 07af4ea..4d864d1 100644
--- a/src/lib/dns/python/rrset_python.cc
+++ b/src/lib/dns/python/rrset_python.cc
@@ -251,9 +251,9 @@ PyObject*
RRset_toWire(PyObject* self_p, PyObject* args) {
PyObject* bytes;
PyObject* mr;
- const s_RRset* self(static_cast<const s_RRset*>(self_p));
try {
+ const s_RRset* self = static_cast<const s_RRset*>(self_p);
if (PyArg_ParseTuple(args, "O", &bytes) && PySequence_Check(bytes)) {
PyObject* bytes_o = bytes;
diff --git a/src/lib/log/message_dictionary.cc b/src/lib/log/message_dictionary.cc
index 3bfc56c..577042b 100644
--- a/src/lib/log/message_dictionary.cc
+++ b/src/lib/log/message_dictionary.cc
@@ -63,13 +63,13 @@ MessageDictionary::load(const char* messages[]) {
vector<std::string> duplicates;
int i = 0;
while (messages[i]) {
-
- // ID present, so note it and point to text.
- const MessageID ident(messages[i++]);
+ // ID present, so point to text.
+ ++i;
if (messages[i]) {
-
+ const MessageID ident(messages[i - 1]);
// Text not null, note it and point to next ident.
- string text(messages[i++]);
+ const std::string text(messages[i]);
+ ++i;
// Add ID and text to message dictionary, noting if the ID was
// already present.
diff --git a/src/lib/resolve/tests/recursive_query_unittest.cc b/src/lib/resolve/tests/recursive_query_unittest.cc
index 48e5a31..df4b9d4 100644
--- a/src/lib/resolve/tests/recursive_query_unittest.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest.cc
@@ -377,7 +377,6 @@ protected:
DNSLookup* lookup = NULL,
DNSAnswer* answer = NULL) :
io_(io_service),
- done_(false),
message_(new Message(Message::PARSE)),
answer_message_(new Message(Message::RENDER)),
respbuf_(new OutputBuffer(0)),
@@ -406,7 +405,6 @@ protected:
protected:
IOService& io_;
- bool done_;
private:
// Currently unused; these will be used for testing
More information about the bind10-changes
mailing list