[svn] commit: r3225 - in /trunk/src: bin/auth/tests/ lib/cc/ lib/cc/tests/ lib/config/ lib/config/tests/ lib/datasrc/ lib/datasrc/tests/ lib/dns/ lib/dns/rdata/ch_3/ lib/dns/rdata/generic/ lib/dns/rdata/hs_4/ lib/dns/tests/ lib/dns/util/ lib/exceptions/ lib/exceptions/tests/ lib/xfr/
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Oct 15 08:59:25 UTC 2010
Author: jinmei
Date: Fri Oct 15 08:59:24 2010
New Revision: 3225
Log:
overall style cleanup: adjusted brace positions according to the coding guideline.
skipping review. confirmed it compiled.
Modified:
trunk/src/bin/auth/tests/run_unittests.cc
trunk/src/lib/cc/data.cc
trunk/src/lib/cc/tests/run_unittests.cc
trunk/src/lib/config/ccsession.cc
trunk/src/lib/config/tests/ccsession_unittests.cc
trunk/src/lib/config/tests/module_spec_unittests.cc
trunk/src/lib/config/tests/run_unittests.cc
trunk/src/lib/datasrc/static_datasrc.cc
trunk/src/lib/datasrc/tests/run_unittests.cc
trunk/src/lib/dns/gen-rdatacode.py.in
trunk/src/lib/dns/message.cc
trunk/src/lib/dns/message.h
trunk/src/lib/dns/question.cc
trunk/src/lib/dns/rdata.cc
trunk/src/lib/dns/rdata/ch_3/a_1.cc
trunk/src/lib/dns/rdata/generic/cname_5.cc
trunk/src/lib/dns/rdata/generic/dname_39.cc
trunk/src/lib/dns/rdata/generic/dnskey_48.cc
trunk/src/lib/dns/rdata/generic/ds_43.cc
trunk/src/lib/dns/rdata/generic/mx_15.cc
trunk/src/lib/dns/rdata/generic/ns_2.cc
trunk/src/lib/dns/rdata/generic/nsec3_50.cc
trunk/src/lib/dns/rdata/generic/nsec3param_51.cc
trunk/src/lib/dns/rdata/generic/opt_41.cc
trunk/src/lib/dns/rdata/generic/ptr_12.cc
trunk/src/lib/dns/rdata/generic/rrsig_46.cc
trunk/src/lib/dns/rdata/generic/soa_6.cc
trunk/src/lib/dns/rdata/hs_4/a_1.cc
trunk/src/lib/dns/rrclass-placeholder.h
trunk/src/lib/dns/rrclass.cc
trunk/src/lib/dns/rrparamregistry-placeholder.cc
trunk/src/lib/dns/rrset.cc
trunk/src/lib/dns/rrsetlist.cc
trunk/src/lib/dns/rrttl.cc
trunk/src/lib/dns/rrtype-placeholder.h
trunk/src/lib/dns/rrtype.cc
trunk/src/lib/dns/tests/buffer_unittest.cc
trunk/src/lib/dns/tests/name_unittest.cc
trunk/src/lib/dns/tests/question_unittest.cc
trunk/src/lib/dns/tests/rdata_cname_unittest.cc
trunk/src/lib/dns/tests/rdata_dname_unittest.cc
trunk/src/lib/dns/tests/rdata_ns_unittest.cc
trunk/src/lib/dns/tests/rdata_opt_unittest.cc
trunk/src/lib/dns/tests/rdata_ptr_unittest.cc
trunk/src/lib/dns/tests/rdata_unittest.cc
trunk/src/lib/dns/tests/rrclass_unittest.cc
trunk/src/lib/dns/tests/rrparamregistry_unittest.cc
trunk/src/lib/dns/tests/rrset_unittest.cc
trunk/src/lib/dns/tests/rrttl_unittest.cc
trunk/src/lib/dns/tests/rrtype_unittest.cc
trunk/src/lib/dns/util/sha1.cc
trunk/src/lib/exceptions/exceptions.cc
trunk/src/lib/exceptions/tests/run_unittests.cc
trunk/src/lib/xfr/python_xfr.cc
trunk/src/lib/xfr/xfrout_client.cc
Modified: trunk/src/bin/auth/tests/run_unittests.cc
==============================================================================
--- trunk/src/bin/auth/tests/run_unittests.cc (original)
+++ trunk/src/bin/auth/tests/run_unittests.cc Fri Oct 15 08:59:24 2010
@@ -19,8 +19,7 @@
#include <dns/tests/unittest_util.h>
int
-main(int argc, char* argv[])
-{
+main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
isc::UnitTestUtil::addDataPath(TEST_DATA_DIR);
isc::UnitTestUtil::addDataPath(TEST_DATA_BUILDDIR);
Modified: trunk/src/lib/cc/data.cc
==============================================================================
--- trunk/src/lib/cc/data.cc (original)
+++ trunk/src/lib/cc/data.cc Fri Oct 15 08:59:24 2010
@@ -184,7 +184,8 @@
namespace {
inline void
-throwJSONError(const std::string& error, const std::string& file, int line, int pos)
+throwJSONError(const std::string& error, const std::string& file, int line,
+ int pos)
{
std::stringstream ss;
ss << error << " in " + file + ":" << line << ":" << pos;
@@ -427,13 +428,15 @@
}
ElementPtr
-from_stringstream_string(std::istream& in, const std::string& file, int& line, int& pos)
+from_stringstream_string(std::istream& in, const std::string& file, int& line,
+ int& pos)
{
return (Element::create(str_from_stringstream(in, file, line, pos)));
}
ElementPtr
-from_stringstream_list(std::istream &in, const std::string& file, int& line, int& pos)
+from_stringstream_list(std::istream &in, const std::string& file, int& line,
+ int& pos)
{
char c = 0;
ElementPtr list = Element::createList();
@@ -484,8 +487,7 @@
}
std::string
-Element::typeToName(Element::types type)
-{
+Element::typeToName(Element::types type) {
switch (type) {
case Element::integer:
return (std::string("integer"));
@@ -538,14 +540,16 @@
}
ElementPtr
-Element::fromJSON(std::istream& in, const std::string& file_name) throw(JSONError)
+Element::fromJSON(std::istream& in, const std::string& file_name)
+ throw(JSONError)
{
int line = 1, pos = 1;
return (fromJSON(in, file_name, line, pos));
}
ElementPtr
-Element::fromJSON(std::istream &in, const std::string& file, int& line, int& pos) throw(JSONError)
+Element::fromJSON(std::istream &in, const std::string& file, int& line,
+ int& pos) throw(JSONError)
{
char c = 0;
ElementPtr element;
Modified: trunk/src/lib/cc/tests/run_unittests.cc
==============================================================================
--- trunk/src/lib/cc/tests/run_unittests.cc (original)
+++ trunk/src/lib/cc/tests/run_unittests.cc Fri Oct 15 08:59:24 2010
@@ -17,8 +17,7 @@
#include <gtest/gtest.h>
int
-main(int argc, char* argv[])
-{
+main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
return (RUN_ALL_TESTS());
}
Modified: trunk/src/lib/config/ccsession.cc
==============================================================================
--- trunk/src/lib/config/ccsession.cc (original)
+++ trunk/src/lib/config/ccsession.cc Fri Oct 15 08:59:24 2010
@@ -333,8 +333,7 @@
}
std::string
-ModuleCCSession::addRemoteConfig(const std::string& spec_file_name)
-{
+ModuleCCSession::addRemoteConfig(const std::string& spec_file_name) {
ModuleSpec rmod_spec = readModuleSpecification(spec_file_name);
std::string module_name = rmod_spec.getFullSpec()->get("module_name")->stringValue();
ConfigData rmod_config = ConfigData(rmod_spec);
@@ -362,8 +361,7 @@
}
void
-ModuleCCSession::removeRemoteConfig(const std::string& module_name)
-{
+ModuleCCSession::removeRemoteConfig(const std::string& module_name) {
std::map<std::string, ConfigData>::iterator it;
it = remote_module_configs_.find(module_name);
Modified: trunk/src/lib/config/tests/ccsession_unittests.cc
==============================================================================
--- trunk/src/lib/config/tests/ccsession_unittests.cc (original)
+++ trunk/src/lib/config/tests/ccsession_unittests.cc Fri Oct 15 08:59:24 2010
@@ -164,8 +164,7 @@
EXPECT_EQ(0, session.getMsgQueue()->size());
}
-TEST_F(CCSessionTest, session2)
-{
+TEST_F(CCSessionTest, session2) {
EXPECT_EQ(false, session.haveSubscription("Spec2", "*"));
ModuleCCSession mccs(ccspecfile("spec2.spec"), session, NULL, NULL);
EXPECT_EQ(true, session.haveSubscription("Spec2", "*"));
Modified: trunk/src/lib/config/tests/module_spec_unittests.cc
==============================================================================
--- trunk/src/lib/config/tests/module_spec_unittests.cc (original)
+++ trunk/src/lib/config/tests/module_spec_unittests.cc Fri Oct 15 08:59:24 2010
@@ -105,8 +105,7 @@
"badname is not a valid type name");
}
-TEST(ModuleSpec, SpecfileConfigData)
-{
+TEST(ModuleSpec, SpecfileConfigData) {
module_spec_error("spec7.spec",
"module_name missing in { }");
module_spec_error("spec8.spec",
@@ -117,8 +116,7 @@
"commands is not a list of elements");
}
-TEST(ModuleSpec, SpecfileCommands)
-{
+TEST(ModuleSpec, SpecfileCommands) {
module_spec_error("spec17.spec",
"command_name missing in { \"command_args\": [ { \"item_default\": \"\", \"item_name\": \"message\", \"item_optional\": false, \"item_type\": \"string\" } ], \"command_description\": \"Print the given message to stdout\" }");
module_spec_error("spec18.spec",
Modified: trunk/src/lib/config/tests/run_unittests.cc
==============================================================================
--- trunk/src/lib/config/tests/run_unittests.cc (original)
+++ trunk/src/lib/config/tests/run_unittests.cc Fri Oct 15 08:59:24 2010
@@ -17,8 +17,7 @@
#include <gtest/gtest.h>
int
-main(int argc, char* argv[])
-{
+main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
return (RUN_ALL_TESTS());
}
Modified: trunk/src/lib/datasrc/static_datasrc.cc
==============================================================================
--- trunk/src/lib/datasrc/static_datasrc.cc (original)
+++ trunk/src/lib/datasrc/static_datasrc.cc Fri Oct 15 08:59:24 2010
@@ -110,14 +110,12 @@
"0 28800 7200 604800 86400"));
}
-StaticDataSrc::StaticDataSrc()
-{
+StaticDataSrc::StaticDataSrc() {
setClass(RRClass::CH());
impl_ = new StaticDataSrcImpl;
}
-StaticDataSrc::~StaticDataSrc()
-{
+StaticDataSrc::~StaticDataSrc() {
delete impl_;
}
Modified: trunk/src/lib/datasrc/tests/run_unittests.cc
==============================================================================
--- trunk/src/lib/datasrc/tests/run_unittests.cc (original)
+++ trunk/src/lib/datasrc/tests/run_unittests.cc Fri Oct 15 08:59:24 2010
@@ -19,8 +19,7 @@
#include <dns/tests/unittest_util.h>
int
-main(int argc, char* argv[])
-{
+main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
isc::UnitTestUtil::addDataPath(TEST_DATA_DIR);
Modified: trunk/src/lib/dns/gen-rdatacode.py.in
==============================================================================
--- trunk/src/lib/dns/gen-rdatacode.py.in (original)
+++ trunk/src/lib/dns/gen-rdatacode.py.in Fri Oct 15 08:59:24 2010
@@ -219,8 +219,7 @@
codetxt = code2txt[code].upper()
declarationtxt += ' ' * 4 + 'static const RR' + cap_key + '& ' + codetxt + '();\n'
deftxt += '''inline const RR''' + cap_key + '''&
-RR''' + cap_key + '''::''' + codetxt + '''()
-{
+RR''' + cap_key + '''::''' + codetxt + '''() {
static RR''' + cap_key + ''' ''' + lower_key + '''(''' + code + ''');
return (''' + lower_key + ''');
}\n
Modified: trunk/src/lib/dns/message.cc
==============================================================================
--- trunk/src/lib/dns/message.cc (original)
+++ trunk/src/lib/dns/message.cc Fri Oct 15 08:59:24 2010
@@ -715,8 +715,7 @@
}
void
-Message::makeResponse()
-{
+Message::makeResponse() {
if (impl_->mode_ != Message::PARSE) {
isc_throw(InvalidMessageOperation,
"makeResponse() is performed in non-parse mode");
Modified: trunk/src/lib/dns/message.h
==============================================================================
--- trunk/src/lib/dns/message.h (original)
+++ trunk/src/lib/dns/message.h Fri Oct 15 08:59:24 2010
@@ -114,50 +114,43 @@
};
inline const MessageFlag&
-MessageFlag::QR()
-{
+MessageFlag::QR() {
static MessageFlag f(0x8000);
return (f);
}
inline const MessageFlag&
-MessageFlag::AA()
-{
+MessageFlag::AA() {
static MessageFlag f(0x0400);
return (f);
}
inline const MessageFlag&
-MessageFlag::TC()
-{
+MessageFlag::TC() {
static MessageFlag f(0x0200);
return (f);
}
inline const MessageFlag&
-MessageFlag::RD()
-{
+MessageFlag::RD() {
static MessageFlag f(0x0100);
return (f);
}
inline const MessageFlag&
-MessageFlag::RA()
-{
+MessageFlag::RA() {
static MessageFlag f(0x0080);
return (f);
}
inline const MessageFlag&
-MessageFlag::AD()
-{
+MessageFlag::AD() {
static MessageFlag f(0x0020);
return (f);
}
inline const MessageFlag&
-MessageFlag::CD()
-{
+MessageFlag::CD() {
static MessageFlag f(0x0010);
return (f);
}
@@ -199,29 +192,25 @@
};
inline const Section&
-Section::QUESTION()
-{
+Section::QUESTION() {
static Section s(SECTION_QUESTION);
return (s);
}
inline const Section&
-Section::ANSWER()
-{
+Section::ANSWER() {
static Section s(SECTION_ANSWER);
return (s);
}
inline const Section&
-Section::AUTHORITY()
-{
+Section::AUTHORITY() {
static Section s(SECTION_AUTHORITY);
return (s);
}
inline const Section&
-Section::ADDITIONAL()
-{
+Section::ADDITIONAL() {
static Section s(SECTION_ADDITIONAL);
return (s);
}
Modified: trunk/src/lib/dns/question.cc
==============================================================================
--- trunk/src/lib/dns/question.cc (original)
+++ trunk/src/lib/dns/question.cc Fri Oct 15 08:59:24 2010
@@ -42,15 +42,13 @@
}
string
-Question::toText() const
-{
+Question::toText() const {
return (name_.toText() + " " + rrclass_.toText() + " " +
rrtype_.toText() + "\n");
}
unsigned int
-Question::toWire(OutputBuffer& buffer) const
-{
+Question::toWire(OutputBuffer& buffer) const {
name_.toWire(buffer);
rrtype_.toWire(buffer);
rrclass_.toWire(buffer); // number of "entries", which is always 1
@@ -59,8 +57,7 @@
}
unsigned int
-Question::toWire(MessageRenderer& renderer) const
-{
+Question::toWire(MessageRenderer& renderer) const {
renderer.writeName(name_);
rrtype_.toWire(renderer);
rrclass_.toWire(renderer);
@@ -69,8 +66,7 @@
}
ostream&
-operator<<(std::ostream& os, const Question& question)
-{
+operator<<(std::ostream& os, const Question& question) {
os << question.toText();
return (os);
}
Modified: trunk/src/lib/dns/rdata.cc
==============================================================================
--- trunk/src/lib/dns/rdata.cc (original)
+++ trunk/src/lib/dns/rdata.cc Fri Oct 15 08:59:24 2010
@@ -82,8 +82,7 @@
}
int
-compareNames(const Name& n1, const Name& n2)
-{
+compareNames(const Name& n1, const Name& n2) {
size_t len1 = n1.getLength();
size_t len2 = n2.getLength();
size_t cmplen = min(len1, len2);
@@ -107,8 +106,7 @@
vector<uint8_t> data_;
};
-Generic::Generic(InputBuffer& buffer, size_t rdata_len)
-{
+Generic::Generic(InputBuffer& buffer, size_t rdata_len) {
if (rdata_len > MAX_RDLENGTH) {
isc_throw(InvalidRdataLength, "RDLENGTH too large");
}
@@ -119,8 +117,7 @@
impl_ = new GenericImpl(data);
}
-Generic::Generic(const string& rdata_string)
-{
+Generic::Generic(const string& rdata_string) {
istringstream iss(rdata_string);
string unknown_mark;
iss >> unknown_mark;
@@ -181,8 +178,7 @@
impl_ = new GenericImpl(data);
}
-Generic::~Generic()
-{
+Generic::~Generic() {
delete impl_;
}
@@ -191,8 +187,7 @@
{}
Generic&
-Generic::operator=(const Generic& source)
-{
+Generic::operator=(const Generic& source) {
if (impl_ == source.impl_) {
return (*this);
}
@@ -218,8 +213,7 @@
}
string
-Generic::toText() const
-{
+Generic::toText() const {
ostringstream oss;
oss << "\\# " << impl_->data_.size() << " ";
@@ -231,21 +225,18 @@
}
void
-Generic::toWire(OutputBuffer& buffer) const
-{
+Generic::toWire(OutputBuffer& buffer) const {
buffer.writeData(&impl_->data_[0], impl_->data_.size());
}
void
-Generic::toWire(MessageRenderer& renderer) const
-{
+Generic::toWire(MessageRenderer& renderer) const {
renderer.writeData(&impl_->data_[0], impl_->data_.size());
}
namespace {
inline int
-compare_internal(const GenericImpl& lhs, const GenericImpl& rhs)
-{
+compare_internal(const GenericImpl& lhs, const GenericImpl& rhs) {
size_t this_len = lhs.data_.size();
size_t other_len = rhs.data_.size();
size_t len = (this_len < other_len) ? this_len : other_len;
@@ -262,16 +253,14 @@
}
int
-Generic::compare(const Rdata& other) const
-{
+Generic::compare(const Rdata& other) const {
const Generic& other_rdata = dynamic_cast<const Generic&>(other);
return (compare_internal(*impl_, *other_rdata.impl_));
}
std::ostream&
-operator<<(std::ostream& os, const Generic& rdata)
-{
+operator<<(std::ostream& os, const Generic& rdata) {
return (os << rdata.toText());
}
} // end of namespace generic
Modified: trunk/src/lib/dns/rdata/ch_3/a_1.cc
==============================================================================
--- trunk/src/lib/dns/rdata/ch_3/a_1.cc (original)
+++ trunk/src/lib/dns/rdata/ch_3/a_1.cc Fri Oct 15 08:59:24 2010
@@ -30,13 +30,11 @@
// BEGIN_ISC_NAMESPACE
// BEGIN_RDATA_NAMESPACE
-A::A(const string& addrstr UNUSED_PARAM)
-{
+A::A(const string& addrstr UNUSED_PARAM) {
// TBD
}
-A::A(InputBuffer& buffer UNUSED_PARAM, size_t rdata_len UNUSED_PARAM)
-{
+A::A(InputBuffer& buffer UNUSED_PARAM, size_t rdata_len UNUSED_PARAM) {
// TBD
}
@@ -45,27 +43,23 @@
}
void
-A::toWire(OutputBuffer& buffer UNUSED_PARAM) const
-{
+A::toWire(OutputBuffer& buffer UNUSED_PARAM) const {
// TBD
}
void
-A::toWire(MessageRenderer& renderer UNUSED_PARAM) const
-{
+A::toWire(MessageRenderer& renderer UNUSED_PARAM) const {
// TBD
}
string
-A::toText() const
-{
+A::toText() const {
// TBD
isc_throw(InvalidRdataText, "Not implemented yet");
}
int
-A::compare(const Rdata& other UNUSED_PARAM) const
-{
+A::compare(const Rdata& other UNUSED_PARAM) const {
return (0); // dummy. TBD
}
Modified: trunk/src/lib/dns/rdata/generic/cname_5.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/cname_5.cc (original)
+++ trunk/src/lib/dns/rdata/generic/cname_5.cc Fri Oct 15 08:59:24 2010
@@ -49,34 +49,29 @@
{}
void
-CNAME::toWire(OutputBuffer& buffer) const
-{
+CNAME::toWire(OutputBuffer& buffer) const {
cname_.toWire(buffer);
}
void
-CNAME::toWire(MessageRenderer& renderer) const
-{
+CNAME::toWire(MessageRenderer& renderer) const {
renderer.writeName(cname_);
}
string
-CNAME::toText() const
-{
+CNAME::toText() const {
return (cname_.toText());
}
int
-CNAME::compare(const Rdata& other) const
-{
+CNAME::compare(const Rdata& other) const {
const CNAME& other_cname = dynamic_cast<const CNAME&>(other);
return (compareNames(cname_, other_cname.cname_));
}
const Name&
-CNAME::getCname() const
-{
+CNAME::getCname() const {
return (cname_);
}
Modified: trunk/src/lib/dns/rdata/generic/dname_39.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/dname_39.cc (original)
+++ trunk/src/lib/dns/rdata/generic/dname_39.cc Fri Oct 15 08:59:24 2010
@@ -49,34 +49,29 @@
{}
void
-DNAME::toWire(OutputBuffer& buffer) const
-{
+DNAME::toWire(OutputBuffer& buffer) const {
dname_.toWire(buffer);
}
void
-DNAME::toWire(MessageRenderer& renderer) const
-{
+DNAME::toWire(MessageRenderer& renderer) const {
renderer.writeName(dname_);
}
string
-DNAME::toText() const
-{
+DNAME::toText() const {
return (dname_.toText());
}
int
-DNAME::compare(const Rdata& other) const
-{
+DNAME::compare(const Rdata& other) const {
const DNAME& other_dname = dynamic_cast<const DNAME&>(other);
return (compareNames(dname_, other_dname.dname_));
}
const Name&
-DNAME::getDname() const
-{
+DNAME::getDname() const {
return (dname_);
}
Modified: trunk/src/lib/dns/rdata/generic/dnskey_48.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/dnskey_48.cc (original)
+++ trunk/src/lib/dns/rdata/generic/dnskey_48.cc Fri Oct 15 08:59:24 2010
@@ -103,8 +103,7 @@
{}
DNSKEY&
-DNSKEY::operator=(const DNSKEY& source)
-{
+DNSKEY::operator=(const DNSKEY& source) {
if (impl_ == source.impl_) {
return (*this);
}
@@ -116,14 +115,12 @@
return (*this);
}
-DNSKEY::~DNSKEY()
-{
+DNSKEY::~DNSKEY() {
delete impl_;
}
string
-DNSKEY::toText() const
-{
+DNSKEY::toText() const {
return (boost::lexical_cast<string>(static_cast<int>(impl_->flags_)) +
" " + boost::lexical_cast<string>(static_cast<int>(impl_->protocol_)) +
" " + boost::lexical_cast<string>(static_cast<int>(impl_->algorithm_)) +
@@ -131,8 +128,7 @@
}
void
-DNSKEY::toWire(OutputBuffer& buffer) const
-{
+DNSKEY::toWire(OutputBuffer& buffer) const {
buffer.writeUint16(impl_->flags_);
buffer.writeUint8(impl_->protocol_);
buffer.writeUint8(impl_->algorithm_);
@@ -140,8 +136,7 @@
}
void
-DNSKEY::toWire(MessageRenderer& renderer) const
-{
+DNSKEY::toWire(MessageRenderer& renderer) const {
renderer.writeUint16(impl_->flags_);
renderer.writeUint8(impl_->protocol_);
renderer.writeUint8(impl_->algorithm_);
@@ -149,8 +144,7 @@
}
int
-DNSKEY::compare(const Rdata& other) const
-{
+DNSKEY::compare(const Rdata& other) const {
const DNSKEY& other_dnskey = dynamic_cast<const DNSKEY&>(other);
if (impl_->flags_ != other_dnskey.impl_->flags_) {
@@ -176,8 +170,7 @@
}
uint16_t
-DNSKEY::getTag() const
-{
+DNSKEY::getTag() const {
if (impl_->algorithm_ == 1) {
int len = impl_->keydata_.size();
return ((impl_->keydata_[len - 3] << 8) + impl_->keydata_[len - 2]);
Modified: trunk/src/lib/dns/rdata/generic/ds_43.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/ds_43.cc (original)
+++ trunk/src/lib/dns/rdata/generic/ds_43.cc Fri Oct 15 08:59:24 2010
@@ -77,8 +77,7 @@
impl_ = new DSImpl(tag, algorithm, digest_type, digest);
}
-DS::DS(InputBuffer& buffer, size_t rdata_len)
-{
+DS::DS(InputBuffer& buffer, size_t rdata_len) {
if (rdata_len < 4) {
isc_throw(InvalidRdataLength, "DS too short");
}
@@ -99,8 +98,7 @@
{}
DS&
-DS::operator=(const DS& source)
-{
+DS::operator=(const DS& source) {
if (impl_ == source.impl_) {
return (*this);
}
@@ -112,14 +110,12 @@
return (*this);
}
-DS::~DS()
-{
+DS::~DS() {
delete impl_;
}
string
-DS::toText() const
-{
+DS::toText() const {
using namespace boost;
return (lexical_cast<string>(static_cast<int>(impl_->tag_)) +
" " + lexical_cast<string>(static_cast<int>(impl_->algorithm_)) +
@@ -128,8 +124,7 @@
}
void
-DS::toWire(OutputBuffer& buffer) const
-{
+DS::toWire(OutputBuffer& buffer) const {
buffer.writeUint16(impl_->tag_);
buffer.writeUint8(impl_->algorithm_);
buffer.writeUint8(impl_->digest_type_);
@@ -137,8 +132,7 @@
}
void
-DS::toWire(MessageRenderer& renderer) const
-{
+DS::toWire(MessageRenderer& renderer) const {
renderer.writeUint16(impl_->tag_);
renderer.writeUint8(impl_->algorithm_);
renderer.writeUint8(impl_->digest_type_);
@@ -146,8 +140,7 @@
}
int
-DS::compare(const Rdata& other) const
-{
+DS::compare(const Rdata& other) const {
const DS& other_ds = dynamic_cast<const DS&>(other);
if (impl_->tag_ != other_ds.impl_->tag_) {
Modified: trunk/src/lib/dns/rdata/generic/mx_15.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/mx_15.cc (original)
+++ trunk/src/lib/dns/rdata/generic/mx_15.cc Fri Oct 15 08:59:24 2010
@@ -67,28 +67,24 @@
{}
void
-MX::toWire(OutputBuffer& buffer) const
-{
+MX::toWire(OutputBuffer& buffer) const {
buffer.writeUint16(preference_);
mxname_.toWire(buffer);
}
void
-MX::toWire(MessageRenderer& renderer) const
-{
+MX::toWire(MessageRenderer& renderer) const {
renderer.writeUint16(preference_);
renderer.writeName(mxname_);
}
string
-MX::toText() const
-{
+MX::toText() const {
return (lexical_cast<string>(preference_) + " " + mxname_.toText());
}
int
-MX::compare(const Rdata& other) const
-{
+MX::compare(const Rdata& other) const {
const MX& other_mx = dynamic_cast<const MX&>(other);
if (preference_ < other_mx.preference_) {
@@ -101,14 +97,12 @@
}
const Name&
-MX::getMXName() const
-{
+MX::getMXName() const {
return (mxname_);
}
uint16_t
-MX::getMXPref() const
-{
+MX::getMXPref() const {
return (preference_);
}
Modified: trunk/src/lib/dns/rdata/generic/ns_2.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/ns_2.cc (original)
+++ trunk/src/lib/dns/rdata/generic/ns_2.cc Fri Oct 15 08:59:24 2010
@@ -45,34 +45,29 @@
{}
void
-NS::toWire(OutputBuffer& buffer) const
-{
+NS::toWire(OutputBuffer& buffer) const {
nsname_.toWire(buffer);
}
void
-NS::toWire(MessageRenderer& renderer) const
-{
+NS::toWire(MessageRenderer& renderer) const {
renderer.writeName(nsname_);
}
string
-NS::toText() const
-{
+NS::toText() const {
return (nsname_.toText());
}
int
-NS::compare(const Rdata& other) const
-{
+NS::compare(const Rdata& other) const {
const NS& other_ns = dynamic_cast<const NS&>(other);
return (compareNames(nsname_, other_ns.nsname_));
}
const Name&
-NS::getNSName() const
-{
+NS::getNSName() const {
return (nsname_);
}
Modified: trunk/src/lib/dns/rdata/generic/nsec3_50.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/nsec3_50.cc (original)
+++ trunk/src/lib/dns/rdata/generic/nsec3_50.cc Fri Oct 15 08:59:24 2010
@@ -127,8 +127,7 @@
impl_ = new NSEC3Impl(hashalg, flags, iterations, salt, next, typebits);
}
-NSEC3::NSEC3(InputBuffer& buffer, size_t rdata_len)
-{
+NSEC3::NSEC3(InputBuffer& buffer, size_t rdata_len) {
if (rdata_len < 5) {
isc_throw(InvalidRdataLength, "NSEC3 too short");
}
@@ -189,8 +188,7 @@
{}
NSEC3&
-NSEC3::operator=(const NSEC3& source)
-{
+NSEC3::operator=(const NSEC3& source) {
if (impl_ == source.impl_) {
return (*this);
}
@@ -202,14 +200,12 @@
return (*this);
}
-NSEC3::~NSEC3()
-{
+NSEC3::~NSEC3() {
delete impl_;
}
string
-NSEC3::toText() const
-{
+NSEC3::toText() const {
ostringstream s;
int len = 0;
for (int i = 0; i < impl_->typebits_.size(); i += len) {
@@ -241,8 +237,7 @@
}
void
-NSEC3::toWire(OutputBuffer& buffer) const
-{
+NSEC3::toWire(OutputBuffer& buffer) const {
buffer.writeUint8(impl_->hashalg_);
buffer.writeUint8(impl_->flags_);
buffer.writeUint16(impl_->iterations_);
@@ -254,8 +249,7 @@
}
void
-NSEC3::toWire(MessageRenderer& renderer) const
-{
+NSEC3::toWire(MessageRenderer& renderer) const {
renderer.writeUint8(impl_->hashalg_);
renderer.writeUint8(impl_->flags_);
renderer.writeUint16(impl_->iterations_);
@@ -267,8 +261,7 @@
}
int
-NSEC3::compare(const Rdata& other) const
-{
+NSEC3::compare(const Rdata& other) const {
const NSEC3& other_nsec3 = dynamic_cast<const NSEC3&>(other);
if (impl_->hashalg_ != other_nsec3.impl_->hashalg_) {
Modified: trunk/src/lib/dns/rdata/generic/nsec3param_51.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/nsec3param_51.cc (original)
+++ trunk/src/lib/dns/rdata/generic/nsec3param_51.cc Fri Oct 15 08:59:24 2010
@@ -73,8 +73,7 @@
impl_ = new NSEC3PARAMImpl(hashalg, flags, iterations, salt);
}
-NSEC3PARAM::NSEC3PARAM(InputBuffer& buffer, size_t rdata_len)
-{
+NSEC3PARAM::NSEC3PARAM(InputBuffer& buffer, size_t rdata_len) {
if (rdata_len < 4) {
isc_throw(InvalidRdataLength, "NSEC3PARAM too short");
}
@@ -102,8 +101,7 @@
{}
NSEC3PARAM&
-NSEC3PARAM::operator=(const NSEC3PARAM& source)
-{
+NSEC3PARAM::operator=(const NSEC3PARAM& source) {
if (impl_ == source.impl_) {
return (*this);
}
@@ -115,14 +113,12 @@
return (*this);
}
-NSEC3PARAM::~NSEC3PARAM()
-{
+NSEC3PARAM::~NSEC3PARAM() {
delete impl_;
}
string
-NSEC3PARAM::toText() const
-{
+NSEC3PARAM::toText() const {
using namespace boost;
return (lexical_cast<string>(static_cast<int>(impl_->hashalg_)) +
" " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
@@ -131,8 +127,7 @@
}
void
-NSEC3PARAM::toWire(OutputBuffer& buffer) const
-{
+NSEC3PARAM::toWire(OutputBuffer& buffer) const {
buffer.writeUint8(impl_->hashalg_);
buffer.writeUint8(impl_->flags_);
buffer.writeUint16(impl_->iterations_);
@@ -141,8 +136,7 @@
}
void
-NSEC3PARAM::toWire(MessageRenderer& renderer) const
-{
+NSEC3PARAM::toWire(MessageRenderer& renderer) const {
renderer.writeUint8(impl_->hashalg_);
renderer.writeUint8(impl_->flags_);
renderer.writeUint16(impl_->iterations_);
@@ -151,8 +145,7 @@
}
int
-NSEC3PARAM::compare(const Rdata& other) const
-{
+NSEC3PARAM::compare(const Rdata& other) const {
const NSEC3PARAM& other_param = dynamic_cast<const NSEC3PARAM&>(other);
if (impl_->hashalg_ != other_param.impl_->hashalg_) {
Modified: trunk/src/lib/dns/rdata/generic/opt_41.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/opt_41.cc (original)
+++ trunk/src/lib/dns/rdata/generic/opt_41.cc Fri Oct 15 08:59:24 2010
@@ -28,13 +28,11 @@
// BEGIN_ISC_NAMESPACE
// BEGIN_RDATA_NAMESPACE
-OPT::OPT(const string& type_str UNUSED_PARAM)
-{
+OPT::OPT(const string& type_str UNUSED_PARAM) {
isc_throw(InvalidRdataText, "OPT RR cannot be constructed from text");
}
-OPT::OPT(InputBuffer& buffer, size_t rdata_len)
-{
+OPT::OPT(InputBuffer& buffer, size_t rdata_len) {
// setPosition() will throw against a short buffer anyway, but it's safer
// to check it explicitly here.
if (buffer.getLength() - buffer.getPosition() < rdata_len) {
@@ -45,32 +43,27 @@
buffer.setPosition(buffer.getPosition() + rdata_len);
}
-OPT::OPT(const OPT& source UNUSED_PARAM) : Rdata()
-{
+OPT::OPT(const OPT& source UNUSED_PARAM) : Rdata() {
// there's nothing to copy in this simple implementation.
}
std::string
-OPT::toText() const
-{
+OPT::toText() const {
return ("");
}
void
-OPT::toWire(OutputBuffer& buffer UNUSED_PARAM) const
-{
+OPT::toWire(OutputBuffer& buffer UNUSED_PARAM) const {
// nothing to do, as this simple version doesn't support any options.
}
void
-OPT::toWire(MessageRenderer& renderer UNUSED_PARAM) const
-{
+OPT::toWire(MessageRenderer& renderer UNUSED_PARAM) const {
// nothing to do, as this simple version doesn't support any options.
}
int
-OPT::compare(const Rdata& other) const
-{
+OPT::compare(const Rdata& other) const {
//const OPT& other_opt = dynamic_cast<const OPT&>(other);
dynamic_cast<const OPT&>(other); // right now we don't need other_opt
Modified: trunk/src/lib/dns/rdata/generic/ptr_12.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/ptr_12.cc (original)
+++ trunk/src/lib/dns/rdata/generic/ptr_12.cc Fri Oct 15 08:59:24 2010
@@ -45,26 +45,22 @@
{}
std::string
-PTR::toText() const
-{
+PTR::toText() const {
return (ptr_name_.toText());
}
void
-PTR::toWire(OutputBuffer& buffer) const
-{
+PTR::toWire(OutputBuffer& buffer) const {
ptr_name_.toWire(buffer);
}
void
-PTR::toWire(MessageRenderer& renderer) const
-{
+PTR::toWire(MessageRenderer& renderer) const {
renderer.writeName(ptr_name_);
}
int
-PTR::compare(const Rdata& other) const
-{
+PTR::compare(const Rdata& other) const {
// The compare method normally begins with this dynamic cast.
const PTR& other_ptr = dynamic_cast<const PTR&>(other);
@@ -73,8 +69,7 @@
}
const Name&
-PTR::getPTRName() const
-{
+PTR::getPTRName() const {
return (ptr_name_);
}
Modified: trunk/src/lib/dns/rdata/generic/rrsig_46.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/rrsig_46.cc (original)
+++ trunk/src/lib/dns/rdata/generic/rrsig_46.cc Fri Oct 15 08:59:24 2010
@@ -106,8 +106,7 @@
Name(signer_txt), signature);
}
-RRSIG::RRSIG(InputBuffer& buffer, size_t rdata_len)
-{
+RRSIG::RRSIG(InputBuffer& buffer, size_t rdata_len) {
size_t pos = buffer.getPosition();
if (rdata_len < RRSIG_MINIMUM_LEN) {
@@ -142,8 +141,7 @@
{}
RRSIG&
-RRSIG::operator=(const RRSIG& source)
-{
+RRSIG::operator=(const RRSIG& source) {
if (impl_ == source.impl_) {
return (*this);
}
@@ -155,14 +153,12 @@
return (*this);
}
-RRSIG::~RRSIG()
-{
+RRSIG::~RRSIG() {
delete impl_;
}
string
-RRSIG::toText() const
-{
+RRSIG::toText() const {
string expire = timeToText(impl_->timeexpire_);
string inception = timeToText(impl_->timeinception_);
@@ -178,8 +174,7 @@
}
void
-RRSIG::toWire(OutputBuffer& buffer) const
-{
+RRSIG::toWire(OutputBuffer& buffer) const {
impl_->covered_.toWire(buffer);
buffer.writeUint8(impl_->algorithm_);
buffer.writeUint8(impl_->labels_);
@@ -192,8 +187,7 @@
}
void
-RRSIG::toWire(MessageRenderer& renderer) const
-{
+RRSIG::toWire(MessageRenderer& renderer) const {
impl_->covered_.toWire(renderer);
renderer.writeUint8(impl_->algorithm_);
renderer.writeUint8(impl_->labels_);
@@ -206,8 +200,7 @@
}
int
-RRSIG::compare(const Rdata& other) const
-{
+RRSIG::compare(const Rdata& other) const {
const RRSIG& other_rrsig = dynamic_cast<const RRSIG&>(other);
if (impl_->covered_.getCode() != other_rrsig.impl_->covered_.getCode()) {
Modified: trunk/src/lib/dns/rdata/generic/soa_6.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/soa_6.cc (original)
+++ trunk/src/lib/dns/rdata/generic/soa_6.cc Fri Oct 15 08:59:24 2010
@@ -94,24 +94,21 @@
}
void
-SOA::toWire(OutputBuffer& buffer) const
-{
+SOA::toWire(OutputBuffer& buffer) const {
mname_.toWire(buffer);
rname_.toWire(buffer);
buffer.writeData(numdata_, sizeof(numdata_));
}
void
-SOA::toWire(MessageRenderer& renderer) const
-{
+SOA::toWire(MessageRenderer& renderer) const {
renderer.writeName(mname_);
renderer.writeName(rname_);
renderer.writeData(numdata_, sizeof(numdata_));
}
string
-SOA::toText() const
-{
+SOA::toText() const {
InputBuffer b(numdata_, sizeof(numdata_));
uint32_t serial = b.readUint32();
uint32_t refresh = b.readUint32();
@@ -128,8 +125,7 @@
}
int
-SOA::compare(const Rdata& other) const
-{
+SOA::compare(const Rdata& other) const {
const SOA& other_soa = dynamic_cast<const SOA&>(other);
int order = compareNames(mname_, other_soa.mname_);
Modified: trunk/src/lib/dns/rdata/hs_4/a_1.cc
==============================================================================
--- trunk/src/lib/dns/rdata/hs_4/a_1.cc (original)
+++ trunk/src/lib/dns/rdata/hs_4/a_1.cc Fri Oct 15 08:59:24 2010
@@ -30,43 +30,36 @@
// BEGIN_ISC_NAMESPACE
// BEGIN_RDATA_NAMESPACE
-A::A(const string& addrstr UNUSED_PARAM)
-{
+A::A(const string& addrstr UNUSED_PARAM) {
// TBD
}
-A::A(InputBuffer& buffer UNUSED_PARAM, size_t rdata_len UNUSED_PARAM)
-{
+A::A(InputBuffer& buffer UNUSED_PARAM, size_t rdata_len UNUSED_PARAM) {
// TBD
}
-A::A(const A& source UNUSED_PARAM) : Rdata()
-{
+A::A(const A& source UNUSED_PARAM) : Rdata() {
// TBD
}
void
-A::toWire(OutputBuffer& buffer UNUSED_PARAM) const
-{
+A::toWire(OutputBuffer& buffer UNUSED_PARAM) const {
// TBD
}
void
-A::toWire(MessageRenderer& renderer UNUSED_PARAM) const
-{
+A::toWire(MessageRenderer& renderer UNUSED_PARAM) const {
// TBD
}
string
-A::toText() const
-{
+A::toText() const {
// TBD
isc_throw(InvalidRdataText, "Not implemented yet");
}
int
-A::compare(const Rdata& other UNUSED_PARAM) const
-{
+A::compare(const Rdata& other UNUSED_PARAM) const {
return (0); // dummy. TBD
}
Modified: trunk/src/lib/dns/rrclass-placeholder.h
==============================================================================
--- trunk/src/lib/dns/rrclass-placeholder.h (original)
+++ trunk/src/lib/dns/rrclass-placeholder.h Fri Oct 15 08:59:24 2010
@@ -260,16 +260,14 @@
// END_WELL_KNOWN_CLASS_DEFINITIONS
inline const RRClass&
-RRClass::NONE()
-{
+RRClass::NONE() {
static RRClass rrclass(RRCLASS_NONE);
return (rrclass);
}
inline const RRClass&
-RRClass::ANY()
-{
+RRClass::ANY() {
static RRClass rrclass(RRCLASS_ANY);
return (rrclass);
Modified: trunk/src/lib/dns/rrclass.cc
==============================================================================
--- trunk/src/lib/dns/rrclass.cc (original)
+++ trunk/src/lib/dns/rrclass.cc Fri Oct 15 08:59:24 2010
@@ -31,13 +31,11 @@
namespace isc {
namespace dns {
-RRClass::RRClass(const string& classstr)
-{
+RRClass::RRClass(const string& classstr) {
classcode_ = RRParamRegistry::getRegistry().textToClassCode(classstr);
}
-RRClass::RRClass(InputBuffer& buffer)
-{
+RRClass::RRClass(InputBuffer& buffer) {
if (buffer.getLength() - buffer.getPosition() < sizeof(uint16_t)) {
isc_throw(IncompleteRRClass, "incomplete wire-format RR class");
}
@@ -45,26 +43,22 @@
}
const string
-RRClass::toText() const
-{
+RRClass::toText() const {
return (RRParamRegistry::getRegistry().codeToClassText(classcode_));
}
void
-RRClass::toWire(OutputBuffer& buffer) const
-{
+RRClass::toWire(OutputBuffer& buffer) const {
buffer.writeUint16(classcode_);
}
void
-RRClass::toWire(MessageRenderer& renderer) const
-{
+RRClass::toWire(MessageRenderer& renderer) const {
renderer.writeUint16(classcode_);
}
ostream&
-operator<<(ostream& os, const RRClass& rrclass)
-{
+operator<<(ostream& os, const RRClass& rrclass) {
os << rrclass.toText();
return (os);
}
Modified: trunk/src/lib/dns/rrparamregistry-placeholder.cc
==============================================================================
--- trunk/src/lib/dns/rrparamregistry-placeholder.cc (original)
+++ trunk/src/lib/dns/rrparamregistry-placeholder.cc Fri Oct 15 08:59:24 2010
@@ -49,8 +49,7 @@
/// containers below.
///
bool
-CICharLess(char c1, char c2)
-{
+CICharLess(char c1, char c2) {
return (tolower(static_cast<unsigned char>(c1)) <
tolower(static_cast<unsigned char>(c2)));
}
@@ -84,29 +83,25 @@
typedef map<uint16_t, RRTypeParamPtr> CodeRRTypeMap;
inline const string&
-RRTypeParam::UNKNOWN_PREFIX()
-{
+RRTypeParam::UNKNOWN_PREFIX() {
static const string p("TYPE");
return (p);
}
inline size_t
-RRTypeParam::UNKNOWN_PREFIXLEN()
-{
+RRTypeParam::UNKNOWN_PREFIXLEN() {
static size_t plen = UNKNOWN_PREFIX().size();
return (plen);
}
inline const string&
-RRTypeParam::UNKNOWN_MAX()
-{
+RRTypeParam::UNKNOWN_MAX() {
static const string p("TYPE65535");
return (p);
}
inline size_t
-RRTypeParam::UNKNOWN_MAXLEN()
-{
+RRTypeParam::UNKNOWN_MAXLEN() {
static size_t plen = UNKNOWN_MAX().size();
return (plen);
}
@@ -130,29 +125,25 @@
typedef map<uint16_t, RRClassParamPtr> CodeRRClassMap;
inline const string&
-RRClassParam::UNKNOWN_PREFIX()
-{
+RRClassParam::UNKNOWN_PREFIX() {
static const string p("CLASS");
return (p);
}
inline size_t
-RRClassParam::UNKNOWN_PREFIXLEN()
-{
+RRClassParam::UNKNOWN_PREFIXLEN() {
static size_t plen = UNKNOWN_PREFIX().size();
return (plen);
}
inline const string&
-RRClassParam::UNKNOWN_MAX()
-{
+RRClassParam::UNKNOWN_MAX() {
static const string p("CLASS65535");
return (p);
}
inline size_t
-RRClassParam::UNKNOWN_MAXLEN()
-{
+RRClassParam::UNKNOWN_MAXLEN() {
static size_t plen = UNKNOWN_MAX().size();
return (plen);
}
@@ -209,8 +200,7 @@
GenericRdataFactoryMap genericrdata_factories;
};
-RRParamRegistry::RRParamRegistry()
-{
+RRParamRegistry::RRParamRegistry() {
impl_ = new RRParamRegistryImpl;
// set up parameters for well-known RRs
@@ -223,14 +213,12 @@
}
}
-RRParamRegistry::~RRParamRegistry()
-{
+RRParamRegistry::~RRParamRegistry() {
delete impl_;
}
RRParamRegistry&
-RRParamRegistry::getRegistry()
-{
+RRParamRegistry::getRegistry() {
static RRParamRegistry registry;
return (registry);
@@ -301,8 +289,7 @@
}
bool
-RRParamRegistry::removeRdataFactory(const RRType& rrtype)
-{
+RRParamRegistry::removeRdataFactory(const RRType& rrtype) {
GenericRdataFactoryMap::iterator found =
impl_->genericrdata_factories.find(rrtype);
if (found != impl_->genericrdata_factories.end()) {
@@ -320,15 +307,13 @@
/// included in <cstring>. To be as much as portable within the C++ standard
/// we take the "in house" approach here.
///
-bool CICharEqual(char c1, char c2)
-{
+bool CICharEqual(char c1, char c2) {
return (tolower(static_cast<unsigned char>(c1)) ==
tolower(static_cast<unsigned char>(c2)));
}
bool
-caseStringEqual(const string& s1, const string& s2, size_t n)
-{
+caseStringEqual(const string& s1, const string& s2, size_t n) {
assert(s1.size() >= n && s2.size() >= n);
return (mismatch(s1.begin(), s1.begin() + n, s2.begin(), CICharEqual).first
@@ -378,8 +363,7 @@
template <typename MC, typename MS>
inline bool
-removeParam(uint16_t code, MC& codemap, MS& stringmap)
-{
+removeParam(uint16_t code, MC& codemap, MS& stringmap) {
typename MC::iterator found = codemap.find(code);
if (found != codemap.end()) {
@@ -397,8 +381,7 @@
template <typename PT, typename MS, typename ET>
inline uint16_t
-textToCode(const string& code_str, MS& stringmap)
-{
+textToCode(const string& code_str, MS& stringmap) {
typename MS::const_iterator found;
found = stringmap.find(code_str);
@@ -424,8 +407,7 @@
template <typename PT, typename MC>
inline string
-codeToText(uint16_t code, MC& codemap)
-{
+codeToText(uint16_t code, MC& codemap) {
typename MC::const_iterator found;
found = codemap.find(code);
@@ -440,57 +422,49 @@
}
bool
-RRParamRegistry::addType(const string& type_string, uint16_t code)
-{
+RRParamRegistry::addType(const string& type_string, uint16_t code) {
return (addParam<RRTypeParam, CodeRRTypeMap, StrRRTypeMap, RRTypeExists>
(type_string, code, impl_->code2typemap, impl_->str2typemap));
}
bool
-RRParamRegistry::removeType(uint16_t code)
-{
+RRParamRegistry::removeType(uint16_t code) {
return (removeParam<CodeRRTypeMap, StrRRTypeMap>(code, impl_->code2typemap,
impl_->str2typemap));
}
uint16_t
-RRParamRegistry::textToTypeCode(const string& type_string) const
-{
+RRParamRegistry::textToTypeCode(const string& type_string) const {
return (textToCode<RRTypeParam, StrRRTypeMap,
InvalidRRType>(type_string, impl_->str2typemap));
}
string
-RRParamRegistry::codeToTypeText(uint16_t code) const
-{
+RRParamRegistry::codeToTypeText(uint16_t code) const {
return (codeToText<RRTypeParam, CodeRRTypeMap>(code, impl_->code2typemap));
}
bool
-RRParamRegistry::addClass(const string& class_string, uint16_t code)
-{
+RRParamRegistry::addClass(const string& class_string, uint16_t code) {
return (addParam<RRClassParam, CodeRRClassMap, StrRRClassMap, RRClassExists>
(class_string, code, impl_->code2classmap, impl_->str2classmap));
}
bool
-RRParamRegistry::removeClass(uint16_t code)
-{
+RRParamRegistry::removeClass(uint16_t code) {
return (removeParam<CodeRRClassMap, StrRRClassMap>(code,
impl_->code2classmap,
impl_->str2classmap));
}
uint16_t
-RRParamRegistry::textToClassCode(const string& class_string) const
-{
+RRParamRegistry::textToClassCode(const string& class_string) const {
return (textToCode<RRClassParam, StrRRClassMap,
InvalidRRClass>(class_string, impl_->str2classmap));
}
string
-RRParamRegistry::codeToClassText(uint16_t code) const
-{
+RRParamRegistry::codeToClassText(uint16_t code) const {
return (codeToText<RRClassParam, CodeRRClassMap>(code,
impl_->code2classmap));
}
Modified: trunk/src/lib/dns/rrset.cc
==============================================================================
--- trunk/src/lib/dns/rrset.cc (original)
+++ trunk/src/lib/dns/rrset.cc Fri Oct 15 08:59:24 2010
@@ -35,14 +35,12 @@
namespace isc {
namespace dns {
void
-AbstractRRset::addRdata(const Rdata& rdata)
-{
+AbstractRRset::addRdata(const Rdata& rdata) {
addRdata(createRdata(getType(), getClass(), rdata));
}
string
-AbstractRRset::toText() const
-{
+AbstractRRset::toText() const {
string s;
RdataIteratorPtr it = getRdataIterator();
@@ -64,8 +62,7 @@
namespace {
template <typename T>
inline unsigned int
-rrsetToWire(const AbstractRRset& rrset, T& output, const size_t limit)
-{
+rrsetToWire(const AbstractRRset& rrset, T& output, const size_t limit) {
unsigned int n = 0;
RdataIteratorPtr it = rrset.getRdataIterator();
@@ -105,14 +102,12 @@
}
unsigned int
-AbstractRRset::toWire(OutputBuffer& buffer) const
-{
+AbstractRRset::toWire(OutputBuffer& buffer) const {
return (rrsetToWire<OutputBuffer>(*this, buffer, 0));
}
unsigned int
-AbstractRRset::toWire(MessageRenderer& renderer) const
-{
+AbstractRRset::toWire(MessageRenderer& renderer) const {
const unsigned int rrs_written = rrsetToWire<MessageRenderer>(
*this, renderer, renderer.getLengthLimit());
if (getRdataCount() > rrs_written) {
@@ -122,8 +117,7 @@
}
ostream&
-operator<<(ostream& os, const AbstractRRset& rrset)
-{
+operator<<(ostream& os, const AbstractRRset& rrset) {
os << rrset.toText();
return (os);
}
@@ -151,80 +145,67 @@
impl_ = new BasicRRsetImpl(name, rrclass, rrtype, ttl);
}
-BasicRRset::~BasicRRset()
-{
+BasicRRset::~BasicRRset() {
delete impl_;
}
void
-BasicRRset::addRdata(ConstRdataPtr rdata)
-{
+BasicRRset::addRdata(ConstRdataPtr rdata) {
impl_->rdatalist_.push_back(rdata);
}
void
-BasicRRset::addRdata(const Rdata& rdata)
-{
+BasicRRset::addRdata(const Rdata& rdata) {
AbstractRRset::addRdata(rdata);
}
unsigned int
-BasicRRset::getRdataCount() const
-{
+BasicRRset::getRdataCount() const {
return (impl_->rdatalist_.size());
}
const Name&
-BasicRRset::getName() const
-{
+BasicRRset::getName() const {
return (impl_->name_);
}
const RRClass&
-BasicRRset::getClass() const
-{
+BasicRRset::getClass() const {
return (impl_->rrclass_);
}
const RRType&
-BasicRRset::getType() const
-{
+BasicRRset::getType() const {
return (impl_->rrtype_);
}
const RRTTL&
-BasicRRset::getTTL() const
-{
+BasicRRset::getTTL() const {
return (impl_->ttl_);
}
void
-BasicRRset::setName(const Name& name)
-{
+BasicRRset::setName(const Name& name) {
impl_->name_ = name;
}
void
-BasicRRset::setTTL(const RRTTL& ttl)
-{
+BasicRRset::setTTL(const RRTTL& ttl) {
impl_->ttl_ = ttl;
}
string
-BasicRRset::toText() const
-{
+BasicRRset::toText() const {
return (AbstractRRset::toText());
}
unsigned int
-BasicRRset::toWire(OutputBuffer& buffer) const
-{
+BasicRRset::toWire(OutputBuffer& buffer) const {
return (AbstractRRset::toWire(buffer));
}
unsigned int
-BasicRRset::toWire(MessageRenderer& renderer) const
-{
+BasicRRset::toWire(MessageRenderer& renderer) const {
return (AbstractRRset::toWire(renderer));
}
@@ -256,8 +237,7 @@
}
RdataIteratorPtr
-BasicRRset::getRdataIterator() const
-{
+BasicRRset::getRdataIterator() const {
return (RdataIteratorPtr(new BasicRdataIterator(impl_->rdatalist_)));
}
}
Modified: trunk/src/lib/dns/rrsetlist.cc
==============================================================================
--- trunk/src/lib/dns/rrsetlist.cc (original)
+++ trunk/src/lib/dns/rrsetlist.cc Fri Oct 15 08:59:24 2010
@@ -41,8 +41,7 @@
}
void
-RRsetList::append(RRsetList& source)
-{
+RRsetList::append(RRsetList& source) {
BOOST_FOREACH(RRsetPtr rrset, source) {
addRRset(rrset);
}
Modified: trunk/src/lib/dns/rrttl.cc
==============================================================================
--- trunk/src/lib/dns/rrttl.cc (original)
+++ trunk/src/lib/dns/rrttl.cc Fri Oct 15 08:59:24 2010
@@ -29,8 +29,7 @@
namespace isc {
namespace dns {
-RRTTL::RRTTL(const string& ttlstr)
-{
+RRTTL::RRTTL(const string& ttlstr) {
// Some systems (at least gcc-4.4) flow negative values over into
// unsigned integer, where older systems failed to parse. We want
// that failure here, so we extract into int64 and check the value
@@ -45,8 +44,7 @@
}
}
-RRTTL::RRTTL(InputBuffer& buffer)
-{
+RRTTL::RRTTL(InputBuffer& buffer) {
if (buffer.getLength() - buffer.getPosition() < sizeof(uint32_t)) {
isc_throw(IncompleteRRTTL, "incomplete wire-format TTL value");
}
@@ -54,28 +52,24 @@
}
const string
-RRTTL::toText() const
-{
+RRTTL::toText() const {
ostringstream oss;
oss << ttlval_;
return (oss.str());
}
void
-RRTTL::toWire(OutputBuffer& buffer) const
-{
+RRTTL::toWire(OutputBuffer& buffer) const {
buffer.writeUint32(ttlval_);
}
void
-RRTTL::toWire(MessageRenderer& renderer) const
-{
+RRTTL::toWire(MessageRenderer& renderer) const {
renderer.writeUint32(ttlval_);
}
ostream&
-operator<<(ostream& os, const RRTTL& rrttl)
-{
+operator<<(ostream& os, const RRTTL& rrttl) {
os << rrttl.toText();
return (os);
}
Modified: trunk/src/lib/dns/rrtype-placeholder.h
==============================================================================
--- trunk/src/lib/dns/rrtype-placeholder.h (original)
+++ trunk/src/lib/dns/rrtype-placeholder.h Fri Oct 15 08:59:24 2010
@@ -276,22 +276,19 @@
// END_WELL_KNOWN_TYPE_DEFINITIONS
inline const RRType&
-RRType::IXFR()
-{
+RRType::IXFR() {
static RRType rrtype(RRTYPE_IXFR);
return (rrtype);
}
inline const RRType&
-RRType::AXFR()
-{
+RRType::AXFR() {
static RRType rrtype(RRTYPE_AXFR);
return (rrtype);
}
inline const RRType&
-RRType::ANY()
-{
+RRType::ANY() {
static RRType rrtype(RRTYPE_ANY);
return (rrtype);
}
Modified: trunk/src/lib/dns/rrtype.cc
==============================================================================
--- trunk/src/lib/dns/rrtype.cc (original)
+++ trunk/src/lib/dns/rrtype.cc Fri Oct 15 08:59:24 2010
@@ -33,13 +33,11 @@
namespace isc {
namespace dns {
-RRType::RRType(const string& typestr)
-{
+RRType::RRType(const string& typestr) {
typecode_ = RRParamRegistry::getRegistry().textToTypeCode(typestr);
}
-RRType::RRType(InputBuffer& buffer)
-{
+RRType::RRType(InputBuffer& buffer) {
if (buffer.getLength() - buffer.getPosition() < sizeof(uint16_t)) {
isc_throw(IncompleteRRType, "incomplete wire-format RR type");
}
@@ -47,26 +45,22 @@
}
const string
-RRType::toText() const
-{
+RRType::toText() const {
return (RRParamRegistry::getRegistry().codeToTypeText(typecode_));
}
void
-RRType::toWire(OutputBuffer& buffer) const
-{
+RRType::toWire(OutputBuffer& buffer) const {
buffer.writeUint16(typecode_);
}
void
-RRType::toWire(MessageRenderer& renderer) const
-{
+RRType::toWire(MessageRenderer& renderer) const {
renderer.writeUint16(typecode_);
}
ostream&
-operator<<(ostream& os, const RRType& rrtype)
-{
+operator<<(ostream& os, const RRType& rrtype) {
os << rrtype.toText();
return (os);
}
Modified: trunk/src/lib/dns/tests/buffer_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/buffer_unittest.cc (original)
+++ trunk/src/lib/dns/tests/buffer_unittest.cc Fri Oct 15 08:59:24 2010
@@ -48,8 +48,7 @@
const uint8_t BufferTest::testdata[5] = {1, 2, 3, 4, 5};
-TEST_F(BufferTest, inputBufferRead)
-{
+TEST_F(BufferTest, inputBufferRead) {
EXPECT_EQ(5, ibuffer.getLength());
EXPECT_EQ(1, ibuffer.readUint8());
EXPECT_EQ(1, ibuffer.getPosition());
@@ -66,8 +65,7 @@
EXPECT_EQ(0, memcmp(vdata, testdata, sizeof(testdata)));
}
-TEST_F(BufferTest, inputBufferException)
-{
+TEST_F(BufferTest, inputBufferException) {
EXPECT_THROW(ibuffer.setPosition(6), isc::dns::InvalidBufferPosition);
ibuffer.setPosition(sizeof(testdata));
@@ -84,8 +82,7 @@
isc::dns::InvalidBufferPosition);
}
-TEST_F(BufferTest, outputBufferExtend)
-{
+TEST_F(BufferTest, outputBufferExtend) {
EXPECT_EQ(0, obuffer.getCapacity());
EXPECT_EQ(0, obuffer.getLength());
obuffer.writeUint8(10);
@@ -93,8 +90,7 @@
EXPECT_EQ(1, obuffer.getLength());
}
-TEST_F(BufferTest, outputBufferWrite)
-{
+TEST_F(BufferTest, outputBufferWrite) {
const uint8_t* cp;
obuffer.writeUint8(1);
@@ -126,8 +122,7 @@
EXPECT_EQ(0, memcmp(cp + 7, testdata, sizeof(testdata)));
}
-TEST_F(BufferTest, outputBufferWriteat)
-{
+TEST_F(BufferTest, outputBufferWriteat) {
obuffer.writeUint32(data32);
expected_size += sizeof(data32);
@@ -153,8 +148,7 @@
isc::dns::InvalidBufferPosition);
}
-TEST_F(BufferTest, outputBufferSkip)
-{
+TEST_F(BufferTest, outputBufferSkip) {
obuffer.skip(4);
EXPECT_EQ(4, obuffer.getLength());
@@ -162,8 +156,7 @@
EXPECT_EQ(6, obuffer.getLength());
}
-TEST_F(BufferTest, outputBufferTrim)
-{
+TEST_F(BufferTest, outputBufferTrim) {
obuffer.writeData(testdata, sizeof(testdata));
EXPECT_EQ(5, obuffer.getLength());
@@ -176,8 +169,7 @@
EXPECT_THROW(obuffer.trim(3), OutOfRange);
}
-TEST_F(BufferTest, outputBufferReadat)
-{
+TEST_F(BufferTest, outputBufferReadat) {
obuffer.writeData(testdata, sizeof(testdata));
for (int i = 0; i < sizeof(testdata); i ++) {
EXPECT_EQ(testdata[i], obuffer[i]);
@@ -185,8 +177,7 @@
EXPECT_THROW(obuffer[sizeof(testdata)], isc::dns::InvalidBufferPosition);
}
-TEST_F(BufferTest, outputBufferClear)
-{
+TEST_F(BufferTest, outputBufferClear) {
obuffer.writeData(testdata, sizeof(testdata));
obuffer.clear();
EXPECT_EQ(0, obuffer.getLength());
Modified: trunk/src/lib/dns/tests/name_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/name_unittest.cc (original)
+++ trunk/src/lib/dns/tests/name_unittest.cc Fri Oct 15 08:59:24 2010
@@ -84,8 +84,7 @@
}
Name
-NameTest::nameFactoryLowerCase()
-{
+NameTest::nameFactoryLowerCase() {
string lowercase_namestr;
lowercase_namestr.reserve(Name::MAX_WIRE);
@@ -124,8 +123,7 @@
buffer_expected.getData(), buffer_expected.getLength());
}
-TEST_F(NameTest, nonlocalObject)
-{
+TEST_F(NameTest, nonlocalObject) {
// A previous version of code relied on a non local static object for
// name construction, so a non local static Name object defined outside
// the name module might not be initialized correctly. This test detects
@@ -133,8 +131,7 @@
EXPECT_EQ("\\255.example.com.", downcased_global.toText());
}
-TEST_F(NameTest, fromText)
-{
+TEST_F(NameTest, fromText) {
vector<string> strnames;
strnames.push_back("www.example.com");
strnames.push_back("www.example.com."); // with a trailing dot
@@ -216,8 +213,7 @@
EXPECT_EQ(Name::MAX_LABELS, maxlabels.getLabelCount());
}
-TEST_F(NameTest, fromWire)
-{
+TEST_F(NameTest, fromWire) {
//
// test cases derived from BIND9 tests.
//
@@ -271,8 +267,7 @@
EXPECT_EQ(3, nameFactoryFromWire("name_fromWire1", 25).getLabelCount());
}
-TEST_F(NameTest, copyConstruct)
-{
+TEST_F(NameTest, copyConstruct) {
Name copy(example_name);
EXPECT_EQ(copy, example_name);
@@ -283,8 +278,7 @@
EXPECT_EQ(copy3, example_name);
}
-TEST_F(NameTest, assignment)
-{
+TEST_F(NameTest, assignment) {
Name copy(".");
copy = example_name;
EXPECT_EQ(copy, example_name);
@@ -301,8 +295,7 @@
EXPECT_EQ(copy, example_name);
}
-TEST_F(NameTest, toText)
-{
+TEST_F(NameTest, toText) {
// tests derived from BIND9
EXPECT_EQ("a.b.c.d", Name("a.b.c.d").toText(true));
EXPECT_EQ("a.\\\\[[.c.d", Name("a.\\\\[\\[.c.d").toText(true));
@@ -349,8 +342,7 @@
nameFactoryFromWire("name_fromWire14", 0).toText());
}
-TEST_F(NameTest, toWireBuffer)
-{
+TEST_F(NameTest, toWireBuffer) {
vector<unsigned char> data;
OutputBuffer buffer(0);
@@ -364,8 +356,7 @@
// We test various corner cases in Renderer tests, but add this test case
// to fill the code coverage gap.
//
-TEST_F(NameTest, toWireRenderer)
-{
+TEST_F(NameTest, toWireRenderer) {
vector<unsigned char> data;
OutputBuffer buffer(0);
MessageRenderer renderer(buffer);
Modified: trunk/src/lib/dns/tests/question_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/question_unittest.cc (original)
+++ trunk/src/lib/dns/tests/question_unittest.cc Fri Oct 15 08:59:24 2010
@@ -56,8 +56,7 @@
};
Question
-questionFromWire(const char* datafile, size_t position = 0)
-{
+questionFromWire(const char* datafile, size_t position = 0) {
vector<unsigned char> data;
UnitTestUtil::readWireData(datafile, data);
@@ -67,8 +66,7 @@
return (Question(buffer));
}
-TEST_F(QuestionTest, fromWire)
-{
+TEST_F(QuestionTest, fromWire) {
Question q = questionFromWire("question_fromWire");
EXPECT_EQ(example_name1, q.getName());
@@ -88,14 +86,12 @@
EXPECT_THROW(questionFromWire("question_fromWire", 36), IncompleteRRClass);
}
-TEST_F(QuestionTest, toText)
-{
+TEST_F(QuestionTest, toText) {
EXPECT_EQ("foo.example.com. IN NS\n", test_question1.toText());
EXPECT_EQ("bar.example.com. CH A\n", test_question2.toText());
}
-TEST_F(QuestionTest, toWireBuffer)
-{
+TEST_F(QuestionTest, toWireBuffer) {
test_question1.toWire(obuffer);
test_question2.toWire(obuffer);
UnitTestUtil::readWireData("question_toWire1", wiredata);
@@ -103,8 +99,7 @@
obuffer.getLength(), &wiredata[0], wiredata.size());
}
-TEST_F(QuestionTest, toWireRenderer)
-{
+TEST_F(QuestionTest, toWireRenderer) {
test_question1.toWire(renderer);
test_question2.toWire(renderer);
UnitTestUtil::readWireData("question_toWire2", wiredata);
@@ -113,15 +108,13 @@
}
// test operator<<. We simply confirm it appends the result of toText().
-TEST_F(QuestionTest, LeftShiftOperator)
-{
+TEST_F(QuestionTest, LeftShiftOperator) {
ostringstream oss;
oss << test_question1;
EXPECT_EQ(test_question1.toText(), oss.str());
}
-TEST_F(QuestionTest, comparison)
-{
+TEST_F(QuestionTest, comparison) {
const Name a("a"), b("b");
const RRClass in(RRClass::IN()), ch(RRClass::CH());
const RRType ns(RRType::NS()), aaaa(RRType::AAAA());
Modified: trunk/src/lib/dns/tests/rdata_cname_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_cname_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_cname_unittest.cc Fri Oct 15 08:59:24 2010
@@ -50,8 +50,7 @@
// compressed.
0x03, 0x63, 0x6e, 0x32, 0xc0, 0x03 };
-TEST_F(Rdata_CNAME_Test, createFromText)
-{
+TEST_F(Rdata_CNAME_Test, createFromText) {
EXPECT_EQ(0, rdata_cname.compare(generic::CNAME("cn.example.com")));
// explicitly add a trailing dot. should be the same RDATA.
EXPECT_EQ(0, rdata_cname.compare(generic::CNAME("cn.example.com.")));
@@ -64,8 +63,7 @@
"cn.example.com")));
}
-TEST_F(Rdata_CNAME_Test, createFromWire)
-{
+TEST_F(Rdata_CNAME_Test, createFromWire) {
EXPECT_EQ(0, rdata_cname.compare(
*rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
"rdata_cname_fromWire")));
@@ -90,16 +88,14 @@
InvalidRdataLength);
}
-TEST_F(Rdata_CNAME_Test, toWireBuffer)
-{
+TEST_F(Rdata_CNAME_Test, toWireBuffer) {
rdata_cname.toWire(obuffer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
wiredata_cname, sizeof(wiredata_cname));
}
-TEST_F(Rdata_CNAME_Test, toWireRenderer)
-{
+TEST_F(Rdata_CNAME_Test, toWireRenderer) {
rdata_cname.toWire(renderer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
@@ -110,13 +106,11 @@
wiredata_cname2, sizeof(wiredata_cname2));
}
-TEST_F(Rdata_CNAME_Test, toText)
-{
+TEST_F(Rdata_CNAME_Test, toText) {
EXPECT_EQ("cn.example.com.", rdata_cname.toText());
}
-TEST_F(Rdata_CNAME_Test, getCname)
-{
+TEST_F(Rdata_CNAME_Test, getCname) {
EXPECT_EQ(Name("cn.example.com."), rdata_cname.getCname());
}
}
Modified: trunk/src/lib/dns/tests/rdata_dname_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_dname_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_dname_unittest.cc Fri Oct 15 08:59:24 2010
@@ -50,8 +50,7 @@
// compressed.
0x03, 0x64, 0x6e, 0x32, 0xc0, 0x03 };
-TEST_F(Rdata_DNAME_Test, createFromText)
-{
+TEST_F(Rdata_DNAME_Test, createFromText) {
EXPECT_EQ(0, rdata_dname.compare(generic::DNAME("dn.example.com")));
// explicitly add a trailing dot. should be the same RDATA.
EXPECT_EQ(0, rdata_dname.compare(generic::DNAME("dn.example.com.")));
@@ -64,8 +63,7 @@
"dn.example.com")));
}
-TEST_F(Rdata_DNAME_Test, createFromWire)
-{
+TEST_F(Rdata_DNAME_Test, createFromWire) {
EXPECT_EQ(0, rdata_dname.compare(
*rdataFactoryFromFile(RRType("DNAME"), RRClass("IN"),
"rdata_dname_fromWire")));
@@ -90,16 +88,14 @@
InvalidRdataLength);
}
-TEST_F(Rdata_DNAME_Test, toWireBuffer)
-{
+TEST_F(Rdata_DNAME_Test, toWireBuffer) {
rdata_dname.toWire(obuffer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
wiredata_dname, sizeof(wiredata_dname));
}
-TEST_F(Rdata_DNAME_Test, toWireRenderer)
-{
+TEST_F(Rdata_DNAME_Test, toWireRenderer) {
rdata_dname.toWire(renderer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
@@ -110,13 +106,11 @@
wiredata_dname2, sizeof(wiredata_dname2));
}
-TEST_F(Rdata_DNAME_Test, toText)
-{
+TEST_F(Rdata_DNAME_Test, toText) {
EXPECT_EQ("dn.example.com.", rdata_dname.toText());
}
-TEST_F(Rdata_DNAME_Test, getDname)
-{
+TEST_F(Rdata_DNAME_Test, getDname) {
EXPECT_EQ(Name("dn.example.com."), rdata_dname.getDname());
}
}
Modified: trunk/src/lib/dns/tests/rdata_ns_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_ns_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_ns_unittest.cc Fri Oct 15 08:59:24 2010
@@ -50,8 +50,7 @@
// compressed.
0x03, 0x6e, 0x73, 0x32, 0xc0, 0x03 };
-TEST_F(Rdata_NS_Test, createFromText)
-{
+TEST_F(Rdata_NS_Test, createFromText) {
EXPECT_EQ(0, rdata_ns.compare(generic::NS("ns.example.com")));
// explicitly add a trailing dot. should be the same RDATA.
EXPECT_EQ(0, rdata_ns.compare(generic::NS("ns.example.com.")));
@@ -63,8 +62,7 @@
"ns.example.com")));
}
-TEST_F(Rdata_NS_Test, createFromWire)
-{
+TEST_F(Rdata_NS_Test, createFromWire) {
EXPECT_EQ(0, rdata_ns.compare(
*rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
"rdata_ns_fromWire")));
@@ -89,16 +87,14 @@
InvalidRdataLength);
}
-TEST_F(Rdata_NS_Test, toWireBuffer)
-{
+TEST_F(Rdata_NS_Test, toWireBuffer) {
rdata_ns.toWire(obuffer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
wiredata_ns, sizeof(wiredata_ns));
}
-TEST_F(Rdata_NS_Test, toWireRenderer)
-{
+TEST_F(Rdata_NS_Test, toWireRenderer) {
rdata_ns.toWire(renderer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
@@ -109,21 +105,18 @@
wiredata_ns2, sizeof(wiredata_ns2));
}
-TEST_F(Rdata_NS_Test, toText)
-{
+TEST_F(Rdata_NS_Test, toText) {
EXPECT_EQ("ns.example.com.", rdata_ns.toText());
}
-TEST_F(Rdata_NS_Test, compare)
-{
+TEST_F(Rdata_NS_Test, compare) {
generic::NS small("a.example");
generic::NS large("example");
EXPECT_EQ(true, Name("a.example") > Name("example"));
EXPECT_GT(0, small.compare(large));
}
-TEST_F(Rdata_NS_Test, getNSName)
-{
+TEST_F(Rdata_NS_Test, getNSName) {
EXPECT_EQ(Name("ns.example.com"), rdata_ns.getNSName());
}
}
Modified: trunk/src/lib/dns/tests/rdata_opt_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_opt_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_opt_unittest.cc Fri Oct 15 08:59:24 2010
@@ -38,14 +38,12 @@
const generic::OPT rdata_opt;
-TEST_F(Rdata_OPT_Test, createFromText)
-{
+TEST_F(Rdata_OPT_Test, createFromText) {
// OPT RR cannot be created from text.
EXPECT_THROW(generic::OPT("this does not matter"), InvalidRdataText);
}
-TEST_F(Rdata_OPT_Test, createFromWire)
-{
+TEST_F(Rdata_OPT_Test, createFromWire) {
// Valid cases: in the simple implementation with no supported options,
// we can only check these don't throw.
EXPECT_NO_THROW(rdataFactoryFromFile(RRType::OPT(), RRClass("CLASS4096"),
@@ -59,25 +57,21 @@
InvalidRdataLength);
}
-TEST_F(Rdata_OPT_Test, toWireBuffer)
-{
+TEST_F(Rdata_OPT_Test, toWireBuffer) {
rdata_opt.toWire(obuffer);
EXPECT_EQ(0, obuffer.getLength());
}
-TEST_F(Rdata_OPT_Test, toWireRenderer)
-{
+TEST_F(Rdata_OPT_Test, toWireRenderer) {
rdata_opt.toWire(renderer);
EXPECT_EQ(0, obuffer.getLength());
}
-TEST_F(Rdata_OPT_Test, toText)
-{
+TEST_F(Rdata_OPT_Test, toText) {
EXPECT_EQ("", rdata_opt.toText());
}
-TEST_F(Rdata_OPT_Test, compare)
-{
+TEST_F(Rdata_OPT_Test, compare) {
// This simple implementation always returns "true"
EXPECT_EQ(0, rdata_opt.compare(
*rdataFactoryFromFile(RRType::OPT(), RRClass::CH(),
Modified: trunk/src/lib/dns/tests/rdata_ptr_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_ptr_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_ptr_unittest.cc Fri Oct 15 08:59:24 2010
@@ -54,8 +54,7 @@
// compressed.
0x03, 0x6e, 0x73, 0x32, 0xc0, 0x03 };
-TEST_F(Rdata_PTR_Test, createFromText)
-{
+TEST_F(Rdata_PTR_Test, createFromText) {
EXPECT_EQ(0, rdata_ptr.compare(generic::PTR("ns.example.com")));
// explicitly add a trailing dot. should be the same RDATA.
EXPECT_EQ(0, rdata_ptr.compare(generic::PTR("ns.example.com.")));
@@ -67,8 +66,7 @@
"ns.example.com")));
}
-TEST_F(Rdata_PTR_Test, createFromWire)
-{
+TEST_F(Rdata_PTR_Test, createFromWire) {
EXPECT_EQ(0, rdata_ptr.compare(
*rdataFactoryFromFile(RRType("PTR"), RRClass("IN"),
"rdata_ns_fromWire")));
@@ -93,16 +91,14 @@
InvalidRdataLength);
}
-TEST_F(Rdata_PTR_Test, toWireBuffer)
-{
+TEST_F(Rdata_PTR_Test, toWireBuffer) {
rdata_ptr.toWire(obuffer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
wiredata_ptr, sizeof(wiredata_ptr));
}
-TEST_F(Rdata_PTR_Test, toWireRenderer)
-{
+TEST_F(Rdata_PTR_Test, toWireRenderer) {
rdata_ptr.toWire(renderer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
@@ -113,21 +109,18 @@
wiredata_ptr2, sizeof(wiredata_ptr2));
}
-TEST_F(Rdata_PTR_Test, toText)
-{
+TEST_F(Rdata_PTR_Test, toText) {
EXPECT_EQ("ns.example.com.", rdata_ptr.toText());
}
-TEST_F(Rdata_PTR_Test, compare)
-{
+TEST_F(Rdata_PTR_Test, compare) {
generic::PTR small("a.example");
generic::PTR large("example");
EXPECT_EQ(true, Name("a.example") > Name("example"));
EXPECT_GT(0, small.compare(large));
}
-TEST_F(Rdata_PTR_Test, getPTRName)
-{
+TEST_F(Rdata_PTR_Test, getPTRName) {
EXPECT_EQ(Name("ns.example.com"), rdata_ptr.getPTRName());
}
}
Modified: trunk/src/lib/dns/tests/rdata_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_unittest.cc Fri Oct 15 08:59:24 2010
@@ -68,8 +68,7 @@
};
string
-Rdata_Unknown_Test::getLongestRdataTxt()
-{
+Rdata_Unknown_Test::getLongestRdataTxt() {
ostringstream oss;
oss << "\\# " << MAX_RDLENGTH << " ";
@@ -83,8 +82,7 @@
}
void
-Rdata_Unknown_Test::getLongestRdataWire(vector<uint8_t>& v)
-{
+Rdata_Unknown_Test::getLongestRdataWire(vector<uint8_t>& v) {
unsigned char ch = 0;
for (int i = 0; i < MAX_RDLENGTH; ++i, ++ch) {
v.push_back(ch);
@@ -102,8 +100,7 @@
// renumber it.
const RRType unknown_rrtype = RRType(65000);
-TEST_F(Rdata_Unknown_Test, createFromText)
-{
+TEST_F(Rdata_Unknown_Test, createFromText) {
// valid construction. This also tests a normal case of "FromWire".
EXPECT_EQ(0, generic::Generic("\\# 4 a1b2c30d").compare(
*rdataFactoryFromFile(unknown_rrtype, RRClass::IN(),
@@ -148,8 +145,7 @@
EXPECT_THROW(generic::Generic("\\# 1ff"), InvalidRdataText);
}
-TEST_F(Rdata_Unknown_Test, createFromWire)
-{
+TEST_F(Rdata_Unknown_Test, createFromWire) {
// normal case (including 0-length data) is covered in createFromText.
// buffer too short. the error should be detected in buffer read
@@ -167,8 +163,7 @@
// The following 3 sets of tests check the behavior of createRdata() variants
// with the "unknown" RRtype. The result should be RRclass independent.
-TEST_F(Rdata_Unknown_Test, createRdataFromString)
-{
+TEST_F(Rdata_Unknown_Test, createRdataFromString) {
EXPECT_EQ(0, rdata_unknown.compare(
*createRdata(unknown_rrtype, RRClass::IN(),
rdata_unknowntxt)));
@@ -180,8 +175,7 @@
rdata_unknowntxt)));
}
-TEST_F(Rdata_Unknown_Test, createRdataFromWire)
-{
+TEST_F(Rdata_Unknown_Test, createRdataFromWire) {
InputBuffer ibuffer(wiredata_unknown, sizeof(wiredata_unknown));
EXPECT_EQ(0, rdata_unknown.compare(
*createRdata(unknown_rrtype, RRClass::IN(),
@@ -198,8 +192,7 @@
ibuffer3, sizeof(wiredata_unknown))));
}
-TEST_F(Rdata_Unknown_Test, createRdataByCopy)
-{
+TEST_F(Rdata_Unknown_Test, createRdataByCopy) {
EXPECT_EQ(0, rdata_unknown.compare(
*createRdata(unknown_rrtype, RRClass::IN(), rdata_unknown)));
EXPECT_EQ(0, rdata_unknown.compare(
@@ -209,8 +202,7 @@
rdata_unknown)));
}
-TEST_F(Rdata_Unknown_Test, copyConstruct)
-{
+TEST_F(Rdata_Unknown_Test, copyConstruct) {
generic::Generic copy(rdata_unknown);
EXPECT_EQ(0, copy.compare(rdata_unknown));
@@ -221,8 +213,7 @@
EXPECT_EQ(0, copy3.compare(rdata_unknown));
}
-TEST_F(Rdata_Unknown_Test, assignment)
-{
+TEST_F(Rdata_Unknown_Test, assignment) {
generic::Generic copy("\\# 1 10");
copy = rdata_unknown;
EXPECT_EQ(0, copy.compare(rdata_unknown));
@@ -239,31 +230,27 @@
EXPECT_EQ(0, copy.compare(rdata_unknown));
}
-TEST_F(Rdata_Unknown_Test, toText)
-{
+TEST_F(Rdata_Unknown_Test, toText) {
EXPECT_EQ(rdata_unknowntxt, rdata_unknown.toText());
EXPECT_EQ(getLongestRdataTxt(),
generic::Generic(getLongestRdataTxt()).toText());
}
-TEST_F(Rdata_Unknown_Test, toWireBuffer)
-{
+TEST_F(Rdata_Unknown_Test, toWireBuffer) {
rdata_unknown.toWire(obuffer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
wiredata_unknown, sizeof(wiredata_unknown));
}
-TEST_F(Rdata_Unknown_Test, toWireRenderer)
-{
+TEST_F(Rdata_Unknown_Test, toWireRenderer) {
rdata_unknown.toWire(renderer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
wiredata_unknown, sizeof(wiredata_unknown));
}
-TEST_F(Rdata_Unknown_Test, compare)
-{
+TEST_F(Rdata_Unknown_Test, compare) {
// comparison as left-justified unsigned octet sequences:
EXPECT_EQ(0, rdata_unknown.compare(rdata_unknown));
@@ -281,8 +268,7 @@
EXPECT_LT(0, rdata_unknown.compare(rdata_unknown_short));
}
-TEST_F(Rdata_Unknown_Test, LeftShiftOperator)
-{
+TEST_F(Rdata_Unknown_Test, LeftShiftOperator) {
ostringstream oss;
oss << rdata_unknown;
EXPECT_EQ(rdata_unknown.toText(), oss.str());
@@ -291,8 +277,7 @@
//
// Tests for global utility functions
//
-TEST_F(RdataTest, compareNames)
-{
+TEST_F(RdataTest, compareNames) {
Name small("a.example");
Name large("example");
Modified: trunk/src/lib/dns/tests/rrclass_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rrclass_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rrclass_unittest.cc Fri Oct 15 08:59:24 2010
@@ -51,8 +51,7 @@
0x00, 0x80, 0x00, 0xff, 0xff };
RRClass
-RRClassTest::rrclassFactoryFromWire(const char* datafile)
-{
+RRClassTest::rrclassFactoryFromWire(const char* datafile) {
std::vector<unsigned char> data;
UnitTestUtil::readWireData(datafile, data);
@@ -61,8 +60,7 @@
return (RRClass(buffer));
}
-TEST_F(RRClassTest, fromText)
-{
+TEST_F(RRClassTest, fromText) {
EXPECT_EQ("IN", RRClass("IN").toText());
EXPECT_EQ("CH", RRClass("CH").toText());
@@ -81,29 +79,25 @@
EXPECT_THROW(RRClass("CLASS65000 "), InvalidRRClass);
}
-TEST_F(RRClassTest, fromWire)
-{
+TEST_F(RRClassTest, fromWire) {
EXPECT_EQ(0x1234,
rrclassFactoryFromWire("rrcode16_fromWire1").getCode());
EXPECT_THROW(rrclassFactoryFromWire("rrcode16_fromWire2"),
IncompleteRRClass);
}
-TEST_F(RRClassTest, caseConstruct)
-{
+TEST_F(RRClassTest, caseConstruct) {
EXPECT_EQ("IN", RRClass("in").toText());
EXPECT_EQ("CH", RRClass("ch").toText());
EXPECT_EQ("CLASS65535", RRClass("class65535").toText());
}
-TEST_F(RRClassTest, toText)
-{
+TEST_F(RRClassTest, toText) {
EXPECT_EQ("IN", RRClass(1).toText());
EXPECT_EQ("CLASS65000", RRClass(65000).toText());
}
-TEST_F(RRClassTest, toWireBuffer)
-{
+TEST_F(RRClassTest, toWireBuffer) {
rrclass_1.toWire(obuffer);
rrclass_0x80.toWire(obuffer);
rrclass_0x800.toWire(obuffer);
@@ -115,8 +109,7 @@
wiredata, sizeof(wiredata));
}
-TEST_F(RRClassTest, toWireRenderer)
-{
+TEST_F(RRClassTest, toWireRenderer) {
rrclass_1.toWire(renderer);
rrclass_0x80.toWire(renderer);
rrclass_0x800.toWire(renderer);
@@ -128,14 +121,12 @@
wiredata, sizeof(wiredata));
}
-TEST_F(RRClassTest, wellKnownClasss)
-{
+TEST_F(RRClassTest, wellKnownClasss) {
EXPECT_EQ(1, RRClass::IN().getCode());
EXPECT_EQ("IN", RRClass::IN().toText());
}
-TEST_F(RRClassTest, compare)
-{
+TEST_F(RRClassTest, compare) {
EXPECT_TRUE(RRClass(1) == RRClass("IN"));
EXPECT_TRUE(RRClass(1).equals(RRClass("IN")));
EXPECT_TRUE(RRClass(0).nequals(RRClass("IN")));
@@ -145,8 +136,7 @@
}
// test operator<<. We simply confirm it appends the result of toText().
-TEST_F(RRClassTest, LeftShiftOperator)
-{
+TEST_F(RRClassTest, LeftShiftOperator) {
ostringstream oss;
oss << RRClass::IN();
EXPECT_EQ(RRClass::IN().toText(), oss.str());
Modified: trunk/src/lib/dns/tests/rrparamregistry_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rrparamregistry_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rrparamregistry_unittest.cc Fri Oct 15 08:59:24 2010
@@ -70,8 +70,7 @@
const string RRParamRegistryTest::test_class_str("TESTCLASS");
const string RRParamRegistryTest::test_type_str("TESTTYPE");
-TEST_F(RRParamRegistryTest, addRemove)
-{
+TEST_F(RRParamRegistryTest, addRemove) {
RRParamRegistry::getRegistry().addType(test_type_str, test_type_code);
RRParamRegistry::getRegistry().addClass(test_class_str, test_class_code);
EXPECT_EQ(65533, RRClass("TESTCLASS").getCode());
@@ -90,8 +89,7 @@
EXPECT_FALSE(RRParamRegistry::getRegistry().removeClass(test_class_code));
}
-TEST_F(RRParamRegistryTest, addError)
-{
+TEST_F(RRParamRegistryTest, addError) {
// An attempt to override a pre-registered class should fail with an
// exception, and the pre-registered one should remain in the registry.
EXPECT_THROW(RRParamRegistry::getRegistry().addClass(test_class_str, 1),
@@ -114,8 +112,7 @@
{ return (RdataPtr(new in::A(dynamic_cast<const in::A&>(source)))); }
};
-TEST_F(RRParamRegistryTest, addRemoveFactory)
-{
+TEST_F(RRParamRegistryTest, addRemoveFactory) {
// By default, the test type/code pair should be considered "unknown",
// so the following should trigger an exception.
EXPECT_THROW(createRdata(RRType(test_type_code), RRClass(test_class_code),
Modified: trunk/src/lib/dns/tests/rrset_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rrset_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rrset_unittest.cc Fri Oct 15 08:59:24 2010
@@ -72,57 +72,49 @@
static const int MAX_RDATA_COUNT = 100;
};
-TEST_F(RRsetTest, getRdataCount)
-{
+TEST_F(RRsetTest, getRdataCount) {
for (int i = 0; i < MAX_RDATA_COUNT; ++i) {
EXPECT_EQ(i, rrset_a_empty.getRdataCount());
rrset_a_empty.addRdata(in::A("192.0.2.1"));
}
}
-TEST_F(RRsetTest, getName)
-{
+TEST_F(RRsetTest, getName) {
EXPECT_EQ(test_name, rrset_a.getName());
EXPECT_EQ(test_domain, rrset_ns.getName());
}
-TEST_F(RRsetTest, getClass)
-{
+TEST_F(RRsetTest, getClass) {
EXPECT_EQ(RRClass("IN"), rrset_a.getClass());
EXPECT_EQ(RRClass("CH"), rrset_ch_txt.getClass());
}
-TEST_F(RRsetTest, getType)
-{
+TEST_F(RRsetTest, getType) {
EXPECT_EQ(RRType("A"), rrset_a.getType());
EXPECT_EQ(RRType("NS"), rrset_ns.getType());
EXPECT_EQ(RRType("TXT"), rrset_ch_txt.getType());
}
-TEST_F(RRsetTest, getTTL)
-{
+TEST_F(RRsetTest, getTTL) {
EXPECT_EQ(RRTTL(3600), rrset_a.getTTL());
EXPECT_EQ(RRTTL(86400), rrset_ns.getTTL());
EXPECT_EQ(RRTTL(0), rrset_ch_txt.getTTL());
}
-TEST_F(RRsetTest, setTTL)
-{
+TEST_F(RRsetTest, setTTL) {
rrset_a.setTTL(RRTTL(86400));
EXPECT_EQ(RRTTL(86400), rrset_a.getTTL());
rrset_a.setTTL(RRTTL(0));
EXPECT_EQ(RRTTL(0), rrset_a.getTTL());
}
-TEST_F(RRsetTest, setName)
-{
+TEST_F(RRsetTest, setName) {
rrset_a.setName(test_nsname);
EXPECT_EQ(test_nsname, rrset_a.getName());
}
void
-addRdataTestCommon(const RRset& rrset)
-{
+addRdataTestCommon(const RRset& rrset) {
EXPECT_EQ(2, rrset.getRdataCount());
RdataIteratorPtr it = rrset.getRdataIterator();
@@ -136,8 +128,7 @@
EXPECT_TRUE(it->isLast());
}
-TEST_F(RRsetTest, addRdata)
-{
+TEST_F(RRsetTest, addRdata) {
addRdataTestCommon(rrset_a);
// Reference version of addRdata() doesn't allow to add a different
@@ -145,8 +136,7 @@
EXPECT_THROW(rrset_a.addRdata(generic::NS(test_nsname)), std::bad_cast);
}
-TEST_F(RRsetTest, addRdataPtr)
-{
+TEST_F(RRsetTest, addRdataPtr) {
rrset_a_empty.addRdata(createRdata(rrset_a_empty.getType(),
rrset_a_empty.getClass(),
"192.0.2.1"));
@@ -163,8 +153,7 @@
EXPECT_EQ(3, rrset_a_empty.getRdataCount());
}
-TEST_F(RRsetTest, iterator)
-{
+TEST_F(RRsetTest, iterator) {
// Iterator for an empty RRset.
RdataIteratorPtr it = rrset_a_empty.getRdataIterator();
it->first();
@@ -187,8 +176,7 @@
}
}
-TEST_F(RRsetTest, toText)
-{
+TEST_F(RRsetTest, toText) {
EXPECT_EQ("test.example.com. 3600 IN A 192.0.2.1\n"
"test.example.com. 3600 IN A 192.0.2.2\n",
rrset_a.toText());
@@ -197,8 +185,7 @@
EXPECT_THROW(rrset_a_empty.toText(), EmptyRRset);
}
-TEST_F(RRsetTest, toWireBuffer)
-{
+TEST_F(RRsetTest, toWireBuffer) {
rrset_a.toWire(buffer);
UnitTestUtil::readWireData("rrset_toWire1", wiredata);
@@ -210,8 +197,7 @@
EXPECT_THROW(rrset_a_empty.toWire(buffer), EmptyRRset);
}
-TEST_F(RRsetTest, toWireRenderer)
-{
+TEST_F(RRsetTest, toWireRenderer) {
rrset_ns.addRdata(generic::NS(test_nsname));
rrset_a.toWire(renderer);
@@ -227,8 +213,7 @@
}
// test operator<<. We simply confirm it appends the result of toText().
-TEST_F(RRsetTest, LeftShiftOperator)
-{
+TEST_F(RRsetTest, LeftShiftOperator) {
ostringstream oss;
oss << rrset_a;
EXPECT_EQ(rrset_a.toText(), oss.str());
Modified: trunk/src/lib/dns/tests/rrttl_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rrttl_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rrttl_unittest.cc Fri Oct 15 08:59:24 2010
@@ -57,8 +57,7 @@
0xff, 0xff, 0xff, 0xff };
RRTTL
-RRTTLTest::rrttlFactoryFromWire(const char* datafile)
-{
+RRTTLTest::rrttlFactoryFromWire(const char* datafile) {
std::vector<unsigned char> data;
UnitTestUtil::readWireData(datafile, data);
@@ -67,8 +66,7 @@
return (RRTTL(buffer));
}
-TEST_F(RRTTLTest, fromText)
-{
+TEST_F(RRTTLTest, fromText) {
EXPECT_EQ(0, ttl_0.getValue());
EXPECT_EQ(3600, ttl_1h.getValue());
EXPECT_EQ(86400, ttl_1d.getValue());
@@ -82,16 +80,14 @@
EXPECT_THROW(RRTTL("4294967296"), InvalidRRTTL); // must be 32-bit
}
-TEST_F(RRTTLTest, fromWire)
-{
+TEST_F(RRTTLTest, fromWire) {
EXPECT_EQ(0x12345678,
rrttlFactoryFromWire("rrcode32_fromWire1").getValue());
EXPECT_THROW(rrttlFactoryFromWire("rrcode32_fromWire2"),
IncompleteRRTTL);
}
-TEST_F(RRTTLTest, toText)
-{
+TEST_F(RRTTLTest, toText) {
EXPECT_EQ("0", ttl_0.toText());
EXPECT_EQ("3600", ttl_1h.toText());
EXPECT_EQ("86400", ttl_1d.toText());
@@ -99,8 +95,7 @@
EXPECT_EQ("4294967295", ttl_max.toText());
}
-TEST_F(RRTTLTest, toWireBuffer)
-{
+TEST_F(RRTTLTest, toWireBuffer) {
ttl_0.toWire(obuffer);
ttl_1h.toWire(obuffer);
ttl_1d.toWire(obuffer);
@@ -112,8 +107,7 @@
wiredata, sizeof(wiredata));
}
-TEST_F(RRTTLTest, toWireRenderer)
-{
+TEST_F(RRTTLTest, toWireRenderer) {
ttl_0.toWire(renderer);
ttl_1h.toWire(renderer);
ttl_1d.toWire(renderer);
@@ -125,8 +119,7 @@
wiredata, sizeof(wiredata));
}
-TEST_F(RRTTLTest, equal)
-{
+TEST_F(RRTTLTest, equal) {
EXPECT_TRUE(RRTTL("3600") == ttl_1h);
EXPECT_TRUE(RRTTL("86400").equals(ttl_1d));
@@ -139,8 +132,7 @@
// The test logic is simple, and all tests are just straightforward variations
// of the first one.
//
-TEST_F(RRTTLTest, leq)
-{
+TEST_F(RRTTLTest, leq) {
// small <= large is true
EXPECT_TRUE(ttl_small.leq(ttl_large));
EXPECT_TRUE(ttl_small <= ttl_large);
@@ -154,8 +146,7 @@
EXPECT_FALSE(ttl_large <= ttl_small);
}
-TEST_F(RRTTLTest, geq)
-{
+TEST_F(RRTTLTest, geq) {
EXPECT_TRUE(ttl_large.geq(ttl_small));
EXPECT_TRUE(ttl_large >= ttl_small);
@@ -166,8 +157,7 @@
EXPECT_FALSE(ttl_small >= ttl_large);
}
-TEST_F(RRTTLTest, lthan)
-{
+TEST_F(RRTTLTest, lthan) {
EXPECT_TRUE(ttl_small.lthan(ttl_large));
EXPECT_TRUE(ttl_small < ttl_large);
@@ -178,8 +168,7 @@
EXPECT_FALSE(ttl_large < ttl_small);
}
-TEST_F(RRTTLTest, gthan)
-{
+TEST_F(RRTTLTest, gthan) {
EXPECT_TRUE(ttl_large.gthan(ttl_small));
EXPECT_TRUE(ttl_large > ttl_small);
@@ -191,8 +180,7 @@
}
// test operator<<. We simply confirm it appends the result of toText().
-TEST_F(RRTTLTest, LeftShiftOperator)
-{
+TEST_F(RRTTLTest, LeftShiftOperator) {
ostringstream oss;
oss << ttl_1h;
EXPECT_EQ(ttl_1h.toText(), oss.str());
Modified: trunk/src/lib/dns/tests/rrtype_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rrtype_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rrtype_unittest.cc Fri Oct 15 08:59:24 2010
@@ -51,8 +51,7 @@
0x00, 0x80, 0x00, 0xff, 0xff };
RRType
-RRTypeTest::rrtypeFactoryFromWire(const char* datafile)
-{
+RRTypeTest::rrtypeFactoryFromWire(const char* datafile) {
std::vector<unsigned char> data;
UnitTestUtil::readWireData(datafile, data);
@@ -61,8 +60,7 @@
return (RRType(buffer));
}
-TEST_F(RRTypeTest, fromText)
-{
+TEST_F(RRTypeTest, fromText) {
EXPECT_EQ("A", RRType("A").toText());
EXPECT_EQ("NS", RRType("NS").toText());
@@ -85,29 +83,25 @@
EXPECT_THROW(RRType("TYPE65000 "), InvalidRRType);
}
-TEST_F(RRTypeTest, fromWire)
-{
+TEST_F(RRTypeTest, fromWire) {
EXPECT_EQ(0x1234,
rrtypeFactoryFromWire("rrcode16_fromWire1").getCode());
EXPECT_THROW(rrtypeFactoryFromWire("rrcode16_fromWire2"), IncompleteRRType);
}
// from string, lower case
-TEST_F(RRTypeTest, caseConstruct)
-{
+TEST_F(RRTypeTest, caseConstruct) {
EXPECT_EQ("A", RRType("a").toText());
EXPECT_EQ("NS", RRType("ns").toText());
EXPECT_EQ("TYPE65535", RRType("type65535").toText());
}
-TEST_F(RRTypeTest, toText)
-{
+TEST_F(RRTypeTest, toText) {
EXPECT_EQ("A", RRType(1).toText());
EXPECT_EQ("TYPE65000", RRType(65000).toText());
}
-TEST_F(RRTypeTest, toWireBuffer)
-{
+TEST_F(RRTypeTest, toWireBuffer) {
rrtype_1.toWire(obuffer);
rrtype_0x80.toWire(obuffer);
rrtype_0x800.toWire(obuffer);
@@ -119,8 +113,7 @@
wiredata, sizeof(wiredata));
}
-TEST_F(RRTypeTest, toWireRenderer)
-{
+TEST_F(RRTypeTest, toWireRenderer) {
rrtype_1.toWire(renderer);
rrtype_0x80.toWire(renderer);
rrtype_0x800.toWire(renderer);
@@ -132,14 +125,12 @@
wiredata, sizeof(wiredata));
}
-TEST_F(RRTypeTest, wellKnownTypes)
-{
+TEST_F(RRTypeTest, wellKnownTypes) {
EXPECT_EQ(1, RRType::A().getCode());
EXPECT_EQ("A", RRType::A().toText());
}
-TEST_F(RRTypeTest, compare)
-{
+TEST_F(RRTypeTest, compare) {
EXPECT_TRUE(RRType(1) == RRType("A"));
EXPECT_TRUE(RRType(1).equals(RRType("A")));
EXPECT_TRUE(RRType(0) != RRType("A"));
@@ -150,8 +141,7 @@
}
// test operator<<. We simply confirm it appends the result of toText().
-TEST_F(RRTypeTest, LeftShiftOperator)
-{
+TEST_F(RRTypeTest, LeftShiftOperator) {
ostringstream oss;
oss << RRType::A();
EXPECT_EQ(RRType::A().toText(), oss.str());
Modified: trunk/src/lib/dns/util/sha1.cc
==============================================================================
--- trunk/src/lib/dns/util/sha1.cc (original)
+++ trunk/src/lib/dns/util/sha1.cc Fri Oct 15 08:59:24 2010
@@ -312,8 +312,7 @@
* sha Error Code.
*
*/
-static void SHA1Finalize(SHA1Context *context, uint8_t Pad_Byte)
-{
+static void SHA1Finalize(SHA1Context *context, uint8_t Pad_Byte) {
int i;
SHA1PadMessage(context, Pad_Byte);
/* message may be sensitive, clear it out */
@@ -350,8 +349,7 @@
* Nothing.
*
*/
-static void SHA1PadMessage(SHA1Context *context, uint8_t Pad_Byte)
-{
+static void SHA1PadMessage(SHA1Context *context, uint8_t Pad_Byte) {
/*
* Check to see if the current message block is too small to hold
* the initial padding bits and length. If so, we will pad the
Modified: trunk/src/lib/exceptions/exceptions.cc
==============================================================================
--- trunk/src/lib/exceptions/exceptions.cc (original)
+++ trunk/src/lib/exceptions/exceptions.cc Fri Oct 15 08:59:24 2010
@@ -23,8 +23,7 @@
namespace isc {
const char*
-Exception::what() const throw()
-{
+Exception::what() const throw() {
const char* whatstr = "isc::Exception";
// XXX: even though it's very unlikely that c_str() throws an exception,
Modified: trunk/src/lib/exceptions/tests/run_unittests.cc
==============================================================================
--- trunk/src/lib/exceptions/tests/run_unittests.cc (original)
+++ trunk/src/lib/exceptions/tests/run_unittests.cc Fri Oct 15 08:59:24 2010
@@ -17,8 +17,7 @@
#include <gtest/gtest.h>
int
-main(int argc, char* argv[])
-{
+main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
return (RUN_ALL_TESTS());
}
Modified: trunk/src/lib/xfr/python_xfr.cc
==============================================================================
--- trunk/src/lib/xfr/python_xfr.cc (original)
+++ trunk/src/lib/xfr/python_xfr.cc Fri Oct 15 08:59:24 2010
@@ -28,8 +28,7 @@
using namespace isc::xfr;
using namespace boost::python;
-BOOST_PYTHON_MODULE(bind10_xfr)
-{
+BOOST_PYTHON_MODULE(bind10_xfr) {
def("recv_fd", &recv_fd);
def("send_fd", &send_fd);
}
Modified: trunk/src/lib/xfr/xfrout_client.cc
==============================================================================
--- trunk/src/lib/xfr/xfrout_client.cc (original)
+++ trunk/src/lib/xfr/xfrout_client.cc Fri Oct 15 08:59:24 2010
@@ -47,8 +47,7 @@
impl_(new XfroutClientImpl(file))
{}
-XfroutClient::~XfroutClient()
-{
+XfroutClient::~XfroutClient() {
delete impl_;
}
More information about the bind10-changes
mailing list