From c692005bb0d344b7554ea0f44a8ee0e1a9b82417 Mon Sep 17 00:00:00 2001 From: Xiangquan Xiao Date: Mon, 18 Nov 2019 14:14:53 -0800 Subject: [PATCH] Common: Retire unused DecodeBase64. --- modules/common/util/string_util.cc | 33 ------------------------- modules/common/util/string_util.h | 2 -- modules/common/util/string_util_test.cc | 10 -------- 3 files changed, 45 deletions(-) diff --git a/modules/common/util/string_util.cc b/modules/common/util/string_util.cc index 4c6114b278..a10f36aa37 100644 --- a/modules/common/util/string_util.cc +++ b/modules/common/util/string_util.cc @@ -27,16 +27,6 @@ namespace { static const char kBase64Array[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -// A table which maps a char to its value in Base64 mode. -std::vector Base64CodeTable() { - std::vector table(256, -1); - const size_t base64_array_length = strlen(kBase64Array); - for (size_t i = 0; i < base64_array_length; ++i) { - table[kBase64Array[i]] = static_cast(i); - } - return table; -} - const char* tripletBase64(const int triplet) { static char result[4]; result[0] = kBase64Array[(triplet >> 18) & 0x3f]; @@ -48,29 +38,6 @@ const char* tripletBase64(const int triplet) { } // namespace -std::string DecodeBase64(const std::string& base64_str) { - static const std::vector kBase64CodeTable = Base64CodeTable(); - - std::string bytes; - // Binary string is generally 3/4 the length of base64 string - bytes.reserve(base64_str.length() * 3 / 4 + 3); - unsigned int sum = 0, sum_bits = 0; - for (const char c : base64_str) { - if (kBase64CodeTable[c] == -1) { - break; - } - - // Convert 6-bits Base64 chars to 8-bits general bytes. - sum = (sum << 6) + kBase64CodeTable[c]; - sum_bits += 6; - if (sum_bits >= 8) { - bytes.push_back(static_cast((sum >> (sum_bits - 8)) & 0xFF)); - sum_bits -= 8; - } - } - return bytes; -} - std::string EncodeBase64(const std::string& in) { std::string out; if (in.empty()) { diff --git a/modules/common/util/string_util.h b/modules/common/util/string_util.h index e1d6260ed2..d7fa406f2b 100644 --- a/modules/common/util/string_util.h +++ b/modules/common/util/string_util.h @@ -43,8 +43,6 @@ struct DebugStringFormatter { } }; -std::string DecodeBase64(const std::string& base64_str); - std::string EncodeBase64(const std::string& in); } // namespace util diff --git a/modules/common/util/string_util_test.cc b/modules/common/util/string_util_test.cc index b5a9ad3a3b..99040e0681 100644 --- a/modules/common/util/string_util_test.cc +++ b/modules/common/util/string_util_test.cc @@ -24,16 +24,6 @@ namespace apollo { namespace common { namespace util { -TEST(StringUtilTest, DecodeBase64) { - EXPECT_EQ("", DecodeBase64("")); - EXPECT_EQ("f", DecodeBase64("Zg==")); - EXPECT_EQ("fo", DecodeBase64("Zm8=")); - EXPECT_EQ("foo", DecodeBase64("Zm9v")); - EXPECT_EQ("foob", DecodeBase64("Zm9vYg==")); - EXPECT_EQ("fooba", DecodeBase64("Zm9vYmE=")); - EXPECT_EQ("foobar", DecodeBase64("Zm9vYmFy")); -} - TEST(StringUtilTest, EncodeBase64) { EXPECT_EQ("", EncodeBase64("")); EXPECT_EQ("Zg==", EncodeBase64("f")); -- GitLab