From f1fcc9cae2915c35ba7b1fafae09d77a60809300 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Thu, 11 Jun 2015 13:59:35 +0200 Subject: [PATCH] [master] untabify --- src/bin/d2/tests/d2_cfg_mgr_unittests.cc | 2 +- src/lib/dhcp/pkt_filter_inet.cc | 2 +- src/lib/dhcpsrv/parsers/dbaccess_parser.h | 2 +- src/lib/dhcpsrv/tests/d2_client_unittest.cc | 4 ++-- src/lib/dns/rdata/any_255/tsig_250.cc | 6 +++--- src/lib/dns/rdata/generic/minfo_14.cc | 6 +++--- src/lib/dns/rdataclass.cc | 8 ++++---- src/lib/log/compiler/message.cc | 2 +- src/lib/log/log_formatter.cc | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc index 5f5b9a858b..bf20387544 100644 --- a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc +++ b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc @@ -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) && diff --git a/src/lib/dhcp/pkt_filter_inet.cc b/src/lib/dhcp/pkt_filter_inet.cc index 468d0335ea..b499911116 100644 --- a/src/lib/dhcp/pkt_filter_inet.cc +++ b/src/lib/dhcp/pkt_filter_inet.cc @@ -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 diff --git a/src/lib/dhcpsrv/parsers/dbaccess_parser.h b/src/lib/dhcpsrv/parsers/dbaccess_parser.h index 2d81b9dde9..797dd5d888 100644 --- a/src/lib/dhcpsrv/parsers/dbaccess_parser.h +++ b/src/lib/dhcpsrv/parsers/dbaccess_parser.h @@ -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 diff --git a/src/lib/dhcpsrv/tests/d2_client_unittest.cc b/src/lib/dhcpsrv/tests/d2_client_unittest.cc index 2390027b7c..1fa015b493 100644 --- a/src/lib/dhcpsrv/tests/d2_client_unittest.cc +++ b/src/lib/dhcpsrv/tests/d2_client_unittest.cc @@ -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, diff --git a/src/lib/dns/rdata/any_255/tsig_250.cc b/src/lib/dns/rdata/any_255/tsig_250.cc index 1da826de71..1b35b39013 100644 --- a/src/lib/dns/rdata/any_255/tsig_250.cc +++ b/src/lib/dns/rdata/any_255/tsig_250.cc @@ -1,4 +1,4 @@ -// 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(error_txt); } catch (const boost::bad_lexical_cast&) { diff --git a/src/lib/dns/rdata/generic/minfo_14.cc b/src/lib/dns/rdata/generic/minfo_14.cc index 58d6f3cf5f..e617b222a7 100644 --- a/src/lib/dns/rdata/generic/minfo_14.cc +++ b/src/lib/dns/rdata/generic/minfo_14.cc @@ -1,4 +1,4 @@ -// 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: " diff --git a/src/lib/dns/rdataclass.cc b/src/lib/dns/rdataclass.cc index 9e0390f781..0d7ee8051a 100644 --- a/src/lib/dns/rdataclass.cc +++ b/src/lib/dns/rdataclass.cc @@ -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(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: " diff --git a/src/lib/log/compiler/message.cc b/src/lib/log/compiler/message.cc index bc0e74280e..f69e3539a0 100644 --- a/src/lib/log/compiler/message.cc +++ b/src/lib/log/compiler/message.cc @@ -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 ns_components = + vector ns_components = splitNamespace(reader.getNamespace()); // Write the header file. diff --git a/src/lib/log/log_formatter.cc b/src/lib/log/log_formatter.cc index b8ff7a32e6..681a2b94a2 100644 --- a/src/lib/log/log_formatter.cc +++ b/src/lib/log/log_formatter.cc @@ -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 { -- 2.47.3