From: Mukund Sivaraman Date: Mon, 24 Dec 2012 03:30:09 +0000 (+0530) Subject: [2535] Rename function to stringToCharString() X-Git-Tag: bind10-1.0.0-rc-release~99^2~25^2~1^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ff7531f6be864ca6965a60ef1e2744e945a3569;p=thirdparty%2Fkea.git [2535] Rename function to stringToCharString() --- diff --git a/src/lib/dns/rdata/generic/detail/char_string.cc b/src/lib/dns/rdata/generic/detail/char_string.cc index dcee08a905..e2857b37f4 100644 --- a/src/lib/dns/rdata/generic/detail/char_string.cc +++ b/src/lib/dns/rdata/generic/detail/char_string.cc @@ -57,8 +57,8 @@ decimalToNumber(const char* s, const char* s_end) { } void -strToCharString(const MasterToken::StringRegion& str_region, - CharString& result) +stringToCharString(const MasterToken::StringRegion& str_region, + CharString& result) { // make a space for the 1-byte length field; filled in at the end result.push_back(0); diff --git a/src/lib/dns/rdata/generic/detail/char_string.h b/src/lib/dns/rdata/generic/detail/char_string.h index b369f40459..4a146db2ae 100644 --- a/src/lib/dns/rdata/generic/detail/char_string.h +++ b/src/lib/dns/rdata/generic/detail/char_string.h @@ -49,8 +49,8 @@ typedef std::vector CharString; /// \brief str_region A string that represents a character-string. /// \brief result A placeholder vector where the resulting data are to be /// stored. Expected to be empty, but it's not checked. -void strToCharString(const MasterToken::StringRegion& str_region, - CharString& result); +void stringToCharString(const MasterToken::StringRegion& str_region, + CharString& result); /// \brief Convert a CharString into a textual DNS character-string. /// diff --git a/src/lib/dns/rdata/generic/detail/txt_like.h b/src/lib/dns/rdata/generic/detail/txt_like.h index 12673aed15..b48d1094ab 100644 --- a/src/lib/dns/rdata/generic/detail/txt_like.h +++ b/src/lib/dns/rdata/generic/detail/txt_like.h @@ -119,7 +119,7 @@ private: break; } string_list_.push_back(std::vector()); - strToCharString(token.getStringRegion(), string_list_.back()); + stringToCharString(token.getStringRegion(), string_list_.back()); } // Let upper layer handle eol/eof. diff --git a/src/lib/dns/tests/rdata_char_string_unittest.cc b/src/lib/dns/tests/rdata_char_string_unittest.cc index 75263916da..eef867f66a 100644 --- a/src/lib/dns/tests/rdata_char_string_unittest.cc +++ b/src/lib/dns/tests/rdata_char_string_unittest.cc @@ -25,7 +25,7 @@ using namespace isc::dns; using namespace isc::dns::rdata; using isc::dns::rdata::generic::detail::CharString; -using isc::dns::rdata::generic::detail::strToCharString; +using isc::dns::rdata::generic::detail::stringToCharString; using isc::dns::rdata::generic::detail::charStringToString; using isc::util::unittests::matchWireData; @@ -61,19 +61,19 @@ createStringRegion(const std::string& str) { TEST_F(CharStringTest, normalConversion) { uint8_t tmp[3]; // placeholder for expected sequence - strToCharString(str_region, chstr); + stringToCharString(str_region, chstr); matchWireData(test_charstr, sizeof(test_charstr), &chstr[0], chstr.size()); // Empty string chstr.clear(); - strToCharString(createStringRegion(""), chstr); + stringToCharString(createStringRegion(""), chstr); tmp[0] = 0; matchWireData(tmp, 1, &chstr[0], chstr.size()); // Possible largest char string chstr.clear(); std::string long_str(255, 'x'); - strToCharString(createStringRegion(long_str), chstr); + stringToCharString(createStringRegion(long_str), chstr); std::vector expected; expected.push_back(255); // len of char string expected.insert(expected.end(), long_str.begin(), long_str.end()); @@ -84,32 +84,32 @@ TEST_F(CharStringTest, normalConversion) { chstr.clear(); long_str.at(254) = '\\'; // replace the last 'x' with '\' long_str.append("120"); // 'x' = 120 - strToCharString(createStringRegion(long_str), chstr); + stringToCharString(createStringRegion(long_str), chstr); matchWireData(&expected[0], expected.size(), &chstr[0], chstr.size()); // Escaped '\' chstr.clear(); tmp[0] = 1; tmp[1] = '\\'; - strToCharString(createStringRegion("\\\\"), chstr); + stringToCharString(createStringRegion("\\\\"), chstr); matchWireData(tmp, 2, &chstr[0], chstr.size()); // Boundary values for \DDD chstr.clear(); tmp[0] = 1; tmp[1] = 0; - strToCharString(createStringRegion("\\000"), chstr); + stringToCharString(createStringRegion("\\000"), chstr); matchWireData(tmp, 2, &chstr[0], chstr.size()); chstr.clear(); - strToCharString(createStringRegion("\\255"), chstr); + stringToCharString(createStringRegion("\\255"), chstr); tmp[0] = 1; tmp[1] = 255; matchWireData(tmp, 2, &chstr[0], chstr.size()); // Another digit follows DDD; it shouldn't cause confusion chstr.clear(); - strToCharString(createStringRegion("\\2550"), chstr); + stringToCharString(createStringRegion("\\2550"), chstr); tmp[0] = 2; // string len is now 2 tmp[2] = '0'; matchWireData(tmp, 3, &chstr[0], chstr.size()); @@ -117,13 +117,13 @@ TEST_F(CharStringTest, normalConversion) { TEST_F(CharStringTest, badConversion) { // string cannot exceed 255 bytes - EXPECT_THROW(strToCharString(createStringRegion(std::string(256, 'a')), - chstr), + EXPECT_THROW(stringToCharString(createStringRegion(std::string(256, 'a')), + chstr), CharStringTooLong); // input string ending with (non escaped) '\' chstr.clear(); - EXPECT_THROW(strToCharString(createStringRegion("foo\\"), chstr), + EXPECT_THROW(stringToCharString(createStringRegion("foo\\"), chstr), InvalidRdataText); } @@ -131,17 +131,17 @@ TEST_F(CharStringTest, badDDD) { // Check various type of bad form of \DDD // Not a number - EXPECT_THROW(strToCharString(createStringRegion("\\1a2"), chstr), + EXPECT_THROW(stringToCharString(createStringRegion("\\1a2"), chstr), InvalidRdataText); - EXPECT_THROW(strToCharString(createStringRegion("\\12a"), chstr), + EXPECT_THROW(stringToCharString(createStringRegion("\\12a"), chstr), InvalidRdataText); // Not in the range of uint8_t - EXPECT_THROW(strToCharString(createStringRegion("\\256"), chstr), + EXPECT_THROW(stringToCharString(createStringRegion("\\256"), chstr), InvalidRdataText); // Short buffer - EXPECT_THROW(strToCharString(createStringRegion("\\42"), chstr), + EXPECT_THROW(stringToCharString(createStringRegion("\\42"), chstr), InvalidRdataText); }