Commit f1fcc9ca authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] untabify

parent a80c9ec0
......@@ -251,7 +251,7 @@ bool checkServer(DnsServerInfoPtr server, const char* hostname,
/// @return returns true if there is a match across the board, otherwise it
/// returns false.
bool checkKey(TSIGKeyInfoPtr key, const std::string& name,
const std::string& algorithm, const std::string& secret,
const std::string& algorithm, const std::string& secret,
uint32_t digestbits = 0) {
// Return value, assume its a match.
return (((key) &&
......
......@@ -237,7 +237,7 @@ PktFilterInet::send(const Iface&, uint16_t sockfd,
struct in_pktinfo* pktinfo =(struct in_pktinfo *)CMSG_DATA(cmsg);
memset(pktinfo, 0, sizeof(struct in_pktinfo));
pktinfo->ipi_ifindex = pkt->getIndex();
pktinfo->ipi_spec_dst.s_addr = htonl(pkt->getLocalAddr()); // set the source IP address
pktinfo->ipi_spec_dst.s_addr = htonl(pkt->getLocalAddr()); // set the source IP address
m.msg_controllen = CMSG_SPACE(sizeof(struct in_pktinfo));
#endif
......
......@@ -96,7 +96,7 @@ public:
/// Creates an instance of this parser.
///
/// @param param_name Name of the parameter used to access the
/// configuration.
/// configuration.
/// @param ctx Parser context.
///
/// @return Pointer to a DbAccessParser. The caller is responsible for
......
......@@ -618,7 +618,7 @@ TEST(D2ClientMgr, qualifyName) {
EXPECT_EQ("somehost.suffix.com.", qualified_name);
//append suffix but dot
//append suffix but dot
ASSERT_NO_THROW(cfg.reset(new D2ClientConfig(true,
isc::asiolink::IOAddress("127.0.0.1"), 477,
isc::asiolink::IOAddress("127.0.0.1"), 478,
......@@ -632,7 +632,7 @@ TEST(D2ClientMgr, qualifyName) {
EXPECT_EQ("somehost.suffix.com", qualified_name);
//append no suffix and not dot
//append no suffix and not dot
ASSERT_NO_THROW(cfg.reset(new D2ClientConfig(true,
isc::asiolink::IOAddress("127.0.0.1"), 477,
isc::asiolink::IOAddress("127.0.0.1"), 478,
......
// Copyright (C) 2010-2014 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -138,8 +138,8 @@ TSIG::constructFromLexer(MasterLexer& lexer, const Name* origin) {
} else if (error_txt == "BADTRUNC") {
error = TSIGError::BAD_TRUNC_CODE;
} else {
/// we cast to uint32_t and range-check, because casting directly to
/// uint16_t will convert negative numbers to large positive numbers
/// we cast to uint32_t and range-check, because casting directly to
/// uint16_t will convert negative numbers to large positive numbers
try {
error = boost::lexical_cast<uint32_t>(error_txt);
} catch (const boost::bad_lexical_cast&) {
......
// Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-2013, 2015 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -57,8 +57,8 @@ MINFO::MINFO(const std::string& minfo_str) :
MasterLexer lexer;
lexer.pushSource(ss);
rmailbox_ = createNameFromLexer(lexer, NULL);
emailbox_ = createNameFromLexer(lexer, NULL);
rmailbox_ = createNameFromLexer(lexer, NULL);
emailbox_ = createNameFromLexer(lexer, NULL);
if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
isc_throw(InvalidRdataText, "extra input text for MINFO: "
......
......@@ -147,8 +147,8 @@ TSIG::constructFromLexer(MasterLexer& lexer, const Name* origin) {
} else if (error_txt == "BADTRUNC") {
error = TSIGError::BAD_TRUNC_CODE;
} else {
/// we cast to uint32_t and range-check, because casting directly to
/// uint16_t will convert negative numbers to large positive numbers
/// we cast to uint32_t and range-check, because casting directly to
/// uint16_t will convert negative numbers to large positive numbers
try {
error = boost::lexical_cast<uint32_t>(error_txt);
} catch (const boost::bad_lexical_cast&) {
......@@ -2230,8 +2230,8 @@ MINFO::MINFO(const std::string& minfo_str) :
MasterLexer lexer;
lexer.pushSource(ss);
rmailbox_ = createNameFromLexer(lexer, NULL);
emailbox_ = createNameFromLexer(lexer, NULL);
rmailbox_ = createNameFromLexer(lexer, NULL);
emailbox_ = createNameFromLexer(lexer, NULL);
if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
isc_throw(InvalidRdataText, "extra input text for MINFO: "
......
......@@ -540,7 +540,7 @@ main(int argc, char* argv[]) {
// Get the namespace into which the message definitions will be put and
// split it into components.
vector<string> ns_components =
vector<string> ns_components =
splitNamespace(reader.getNamespace());
// Write the header file.
......
......@@ -43,7 +43,7 @@ replacePlaceholder(string* message, const string& arg,
else {
// We're missing the placeholder, so throw an exception
isc_throw(MismatchedPlaceholders,
"Missing logger placeholder in message: " << *message);
"Missing logger placeholder in message: " << *message);
}
#else
else {
......
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