BIND 10 trac2376, updated. 2fd70742d86ebf54af42bb3b8dfdf8e9393c14fa [2376] Remove unused parameter
BIND 10 source code commits
bind10-changes at lists.isc.org
Sat Nov 10 11:04:47 UTC 2012
The branch, trac2376 has been updated
via 2fd70742d86ebf54af42bb3b8dfdf8e9393c14fa (commit)
via a88ee8f92b91a55641d1c58da29d15a09dba8fe3 (commit)
from 26226ba0e310815745fa544983785d4d7cdddf47 (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 2fd70742d86ebf54af42bb3b8dfdf8e9393c14fa
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sat Nov 10 12:03:49 2012 +0100
[2376] Remove unused parameter
We don't pass the byte offset to error handlers.
commit a88ee8f92b91a55641d1c58da29d15a09dba8fe3
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sat Nov 10 12:03:37 2012 +0100
[2376] Remove obsolete comment
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/loader_context.cc | 9 ++++-----
src/lib/datasrc/loader_context.h | 10 ++++------
src/lib/datasrc/tests/loader_context_test.cc | 10 +++++-----
src/lib/dns/loader_callbacks.h | 11 ++++-------
src/lib/dns/tests/loader_callbacks_test.cc | 11 +++++------
5 files changed, 22 insertions(+), 29 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/loader_context.cc b/src/lib/datasrc/loader_context.cc
index a378d9e..905caf3 100644
--- a/src/lib/datasrc/loader_context.cc
+++ b/src/lib/datasrc/loader_context.cc
@@ -23,9 +23,8 @@ namespace datasrc {
LoaderContext::LoaderContext(ZoneUpdater& updater, const dns::Name& name,
const dns::RRClass& rrclass) :
- callbacks_(boost::bind(&LoaderContext::handleError, this, _1, _2, _3, _4),
- boost::bind(&LoaderContext::handleWarning, this, _1, _2, _3,
- _4)),
+ callbacks_(boost::bind(&LoaderContext::handleError, this, _1, _2, _3),
+ boost::bind(&LoaderContext::handleWarning, this, _1, _2, _3)),
name_(name),
rrclass_(rrclass),
updater_(updater),
@@ -39,7 +38,7 @@ LoaderContext::addRRset(const isc::dns::RRsetPtr& rrset) {
}
void
-LoaderContext::handleWarning(const std::string& source, size_t line, size_t,
+LoaderContext::handleWarning(const std::string& source, size_t line,
const std::string& reason)
{
LOG_WARN(logger, DATASRC_LOAD_CONTEXT_WARN).arg(source).arg(line).
@@ -47,7 +46,7 @@ LoaderContext::handleWarning(const std::string& source, size_t line, size_t,
}
void
-LoaderContext::handleError(const std::string& source, size_t line, size_t,
+LoaderContext::handleError(const std::string& source, size_t line,
const std::string& reason)
{
LOG_ERROR(logger, DATASRC_LOAD_CONTEXT_ERROR).arg(source).arg(line).
diff --git a/src/lib/datasrc/loader_context.h b/src/lib/datasrc/loader_context.h
index 760b415..0025310 100644
--- a/src/lib/datasrc/loader_context.h
+++ b/src/lib/datasrc/loader_context.h
@@ -83,19 +83,17 @@ public:
private:
/// \brief Internal handler of error.
- void handleError(const std::string& source, size_t line, size_t byte,
+ void handleError(const std::string& source, size_t line,
const std::string& reason);
/// \brief Internal handle of warning.
- void handleWarning(const std::string& source, size_t line, size_t byte,
+ void handleWarning(const std::string& source, size_t line,
const std::string& reason);
/// \brief The callbacks to be returned.
///
- /// They need to exist as a real variable. It also needs to be mutable,
- /// since the getCallbacks() is const method and it returns a non-const
- /// reference. It needs to be non-const, to be possible to call the
- /// the actual callbacks (the operator() might be non-const).
+ /// They need to exist as a real variable, so we can return a reference
+ /// to it.
isc::dns::LoaderCallbacks callbacks_;
// Identification of the zone, used in logging.
diff --git a/src/lib/datasrc/tests/loader_context_test.cc b/src/lib/datasrc/tests/loader_context_test.cc
index 8ed9966..045ea3a 100644
--- a/src/lib/datasrc/tests/loader_context_test.cc
+++ b/src/lib/datasrc/tests/loader_context_test.cc
@@ -93,19 +93,19 @@ TEST_F(LoaderContextTest, constructor) {
// callbacks.
TEST_F(LoaderContextTest, callbacks) {
isc::dns::LoaderCallbacks& callbacks(context_.getCallbacks());
- EXPECT_NO_THROW(callbacks.warning("No source", 1, 1, "Just for fun"));
+ EXPECT_NO_THROW(callbacks.warning("No source", 1, "Just for fun"));
// The warning does not hurt the OK mode.
EXPECT_TRUE(context_.ok());
// Now the error
- EXPECT_NO_THROW(callbacks.error("No source", 2, 4, "Some error"));
+ EXPECT_NO_THROW(callbacks.error("No source", 2, "Some error"));
// The OK is turned off once there's at least one error
EXPECT_FALSE(context_.ok());
// Not being OK does not hurt that much, we can still call the callbacks
- EXPECT_NO_THROW(callbacks.warning("No source", 3, 5, "Just for fun"));
+ EXPECT_NO_THROW(callbacks.warning("No source", 3, "Just for fun"));
// The OK is not reset back to true
EXPECT_FALSE(context_.ok());
- EXPECT_NO_THROW(callbacks.error("No source", 4, 7, "Some error"));
+ EXPECT_NO_THROW(callbacks.error("No source", 4, "Some error"));
}
// Try adding some RRsets.
@@ -118,7 +118,7 @@ TEST_F(LoaderContextTest, addRRset) {
// Making the status not OK by an error does not stop the RRsets to get
// through.
- context_.getCallbacks().error("No source", 1, 1, "Just an error");
+ context_.getCallbacks().error("No source", 1, "Just an error");
EXPECT_FALSE(context_.ok());
EXPECT_NO_THROW(context_.addRRset(generateRRset()));
diff --git a/src/lib/dns/loader_callbacks.h b/src/lib/dns/loader_callbacks.h
index 2933e31..0652dae 100644
--- a/src/lib/dns/loader_callbacks.h
+++ b/src/lib/dns/loader_callbacks.h
@@ -40,12 +40,9 @@ public:
/// This is usually a file name.
/// \param source_line Position of the problem, counted in lines from the
/// beginning of the source.
- /// \param source_byte Position of the problem, counted in number of bytes
- /// from the beginning of the source.
/// \param reason Human readable description of what happened.
typedef boost::function<void(const std::string& source_name,
size_t source_line,
- size_t source_byte,
const std::string& reason)> Callback;
/// \brief Constructor
@@ -77,9 +74,9 @@ public:
/// If the caller of the loader wants to abort, it is possible to throw
/// from the callback, which aborts the load.
void error(const std::string& source_name, size_t source_line,
- size_t source_byte, const std::string& reason)
+ const std::string& reason)
{
- error_(source_name, source_line, source_byte, reason);
+ error_(source_name, source_line, reason);
}
/// \brief Call callback for potential problems
@@ -94,9 +91,9 @@ public:
/// may be false positives), it is possible to throw from inside the
/// callback.
void warning(const std::string& source_name, size_t source_line,
- size_t source_byte, const std::string& reason)
+ const std::string& reason)
{
- warning_(source_name, source_line, source_byte, reason);
+ warning_(source_name, source_line, reason);
}
private:
diff --git a/src/lib/dns/tests/loader_callbacks_test.cc b/src/lib/dns/tests/loader_callbacks_test.cc
index bfea869..d3b83e0 100644
--- a/src/lib/dns/tests/loader_callbacks_test.cc
+++ b/src/lib/dns/tests/loader_callbacks_test.cc
@@ -29,20 +29,19 @@ protected:
LoaderCallbacksTest() :
called_(false),
error_(boost::bind(&LoaderCallbacksTest::checkCallback, this, true, _1,
- _2, _3, _4)),
+ _2, _3)),
warning_(boost::bind(&LoaderCallbacksTest::checkCallback, this, false,
- _1, _2, _3, _4)),
+ _1, _2, _3)),
callbacks_(error_, warning_)
{}
void checkCallback(bool error, const string& source, size_t line,
- size_t byte, const string& reason)
+ const string& reason)
{
called_ = true;
last_was_error_ = error;
EXPECT_EQ("source", source);
EXPECT_EQ(1, line);
- EXPECT_EQ(2, byte);
EXPECT_EQ("reason", reason);
}
bool last_was_error_;
@@ -62,13 +61,13 @@ TEST_F(LoaderCallbacksTest, constructor) {
// Call the callbacks
TEST_F(LoaderCallbacksTest, call) {
- callbacks_.error("source", 1, 2, "reason");
+ callbacks_.error("source", 1, "reason");
EXPECT_TRUE(last_was_error_);
EXPECT_TRUE(called_);
called_ = false;
- callbacks_.warning("source", 1, 2, "reason");
+ callbacks_.warning("source", 1, "reason");
EXPECT_FALSE(last_was_error_);
EXPECT_TRUE(called_);
}
More information about the bind10-changes
mailing list