Commit 6620f7a7 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[2522] trivial style cleanup: folded long lines

parent 0857d558
...@@ -81,7 +81,8 @@ TSIG::constructFromLexer(MasterLexer& lexer) { ...@@ -81,7 +81,8 @@ TSIG::constructFromLexer(MasterLexer& lexer) {
const Name root("."); const Name root(".");
const Name& algorithm = createNameFromLexer(lexer, &root); const Name& algorithm = createNameFromLexer(lexer, &root);
const string time_str = lexer.getNextToken(MasterToken::STRING).getString(); const string time_str =
lexer.getNextToken(MasterToken::STRING).getString();
uint64_t time_signed; uint64_t time_signed;
try { try {
time_signed = boost::lexical_cast<uint64_t>(time_str); time_signed = boost::lexical_cast<uint64_t>(time_str);
...@@ -96,7 +97,8 @@ TSIG::constructFromLexer(MasterLexer& lexer) { ...@@ -96,7 +97,8 @@ TSIG::constructFromLexer(MasterLexer& lexer) {
if (fudge > 0xffff) { if (fudge > 0xffff) {
isc_throw(InvalidRdataText, "TSIG Fudge out of range"); isc_throw(InvalidRdataText, "TSIG Fudge out of range");
} }
const uint32_t macsize = lexer.getNextToken(MasterToken::NUMBER).getNumber(); const uint32_t macsize =
lexer.getNextToken(MasterToken::NUMBER).getNumber();
if (macsize > 0xffff) { if (macsize > 0xffff) {
isc_throw(InvalidRdataText, "TSIG MAC Size out of range"); isc_throw(InvalidRdataText, "TSIG MAC Size out of range");
} }
...@@ -109,12 +111,14 @@ TSIG::constructFromLexer(MasterLexer& lexer) { ...@@ -109,12 +111,14 @@ TSIG::constructFromLexer(MasterLexer& lexer) {
isc_throw(InvalidRdataText, "TSIG MAC Size and data are inconsistent"); isc_throw(InvalidRdataText, "TSIG MAC Size and data are inconsistent");
} }
const uint32_t orig_id = lexer.getNextToken(MasterToken::NUMBER).getNumber(); const uint32_t orig_id =
lexer.getNextToken(MasterToken::NUMBER).getNumber();
if (orig_id > 0xffff) { if (orig_id > 0xffff) {
isc_throw(InvalidRdataText, "TSIG Original ID out of range"); isc_throw(InvalidRdataText, "TSIG Original ID out of range");
} }
const string error_txt = lexer.getNextToken(MasterToken::STRING).getString(); const string error_txt =
lexer.getNextToken(MasterToken::STRING).getString();
uint16_t error = 0; uint16_t error = 0;
// XXX: In the initial implementation we hardcode the mnemonics. // XXX: In the initial implementation we hardcode the mnemonics.
// We'll soon generalize this. // We'll soon generalize this.
...@@ -134,7 +138,8 @@ TSIG::constructFromLexer(MasterLexer& lexer) { ...@@ -134,7 +138,8 @@ TSIG::constructFromLexer(MasterLexer& lexer) {
} }
} }
const int32_t otherlen = lexer.getNextToken(MasterToken::NUMBER).getNumber(); const int32_t otherlen =
lexer.getNextToken(MasterToken::NUMBER).getNumber();
if (otherlen > 0xffff) { if (otherlen > 0xffff) {
isc_throw(InvalidRdataText, "TSIG Other Len out of range"); isc_throw(InvalidRdataText, "TSIG Other Len out of range");
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment