BIND 10 trac2375-r1, updated. 3792c2bf3c21f2b0921632456c362c4bf39ddd09 [2375] Clarify comment
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Nov 19 16:36:08 UTC 2012
The branch, trac2375-r1 has been updated
via 3792c2bf3c21f2b0921632456c362c4bf39ddd09 (commit)
via f9a8f7668e65dc98e7fa7699ce906efe78f4daf8 (commit)
via 20897c866a9c03bdd372f13c6a2829926b6c6782 (commit)
from 99aed51b37494e262cccb3dc34d4b62a6969b48a (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 3792c2bf3c21f2b0921632456c362c4bf39ddd09
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Nov 19 17:35:54 2012 +0100
[2375] Clarify comment
commit f9a8f7668e65dc98e7fa7699ce906efe78f4daf8
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Nov 19 17:33:08 2012 +0100
[2375] Use safety measures
A scoped pointer, in this case. It probably isn't safer, as the ->handle
couldn't throw in this case, but just for the habit.
commit 20897c866a9c03bdd372f13c6a2829926b6c6782
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Nov 19 17:30:50 2012 +0100
[2375] Clarify comment
-----------------------------------------------------------------------
Summary of changes:
src/lib/dns/master_lexer_state.h | 5 +++--
src/lib/dns/tests/master_lexer_unittest.cc | 7 ++++---
2 files changed, 7 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/dns/master_lexer_state.h b/src/lib/dns/master_lexer_state.h
index 4cf7700..fd041b1 100644
--- a/src/lib/dns/master_lexer_state.h
+++ b/src/lib/dns/master_lexer_state.h
@@ -116,8 +116,9 @@ public:
/// The returned State will eat eat_chars from the input source,
/// it'll set the given token if not NULL, call the given callback
/// and return the next state when its handle() is called. Also, the
- /// parentheses count is changed accordingly a the last EOL condition
- /// set if provided.
+ /// parentheses count is changed accordingly to paren_change (positive
+ /// to increase, negative to decrease) and the last_was_eof condition
+ /// is set if set_eol is non-NULL.
///
/// This is provided only for testing purposes. MasterLexer shouldn't
/// need this method.
diff --git a/src/lib/dns/tests/master_lexer_unittest.cc b/src/lib/dns/tests/master_lexer_unittest.cc
index 2eb0c3a..68fd7c0 100644
--- a/src/lib/dns/tests/master_lexer_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_unittest.cc
@@ -178,9 +178,9 @@ TEST_F(MasterLexerTest, tokenFromStart) {
// We don't have access directly inside the implementation.
// We get the fake state, run it to install the token.
// Then we just delete it ourself and return NULL.
- State* state(State::getFakeState(NULL, 0, &token_));
+ scoped_ptr<const State> state(State::getFakeState(NULL, 0,
+ &token_));
state->handle(*this);
- delete state;
return (NULL);
}
private:
@@ -330,7 +330,8 @@ TEST_F(MasterLexerTest, ungetSimple) {
EXPECT_EQ(1, state->getParenCount(lexer));
EXPECT_TRUE(state->wasLastEOL(lexer));
// By calling getToken again, we verify even the source got back to
- // original. We must push it as a fake start again so it is picked.
+ // original (as the second fake state checks it gets "234"). We must
+ // push it as a fake start again so it is picked.
lexer.pushFakeStart(state.get());
EXPECT_EQ(MasterLexer::Token::END_OF_LINE, lexer.getNextToken().getType());
EXPECT_EQ(2, state->getParenCount(lexer));
More information about the bind10-changes
mailing list