Remove internal NumberToDecimalString helper As the TODO suggests, std::to_string works just fine here. Change-Id: I1be992a513e2a8d6e4b9cf2faf48c49c0f47b10e Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/94929 Auto-Submit: David Benjamin <davidben@google.com> Presubmit-BoringSSL-Verified: boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Commit-Queue: Rudolf Polzer <rpolzer@google.com> Reviewed-by: Rudolf Polzer <rpolzer@google.com>
diff --git a/pki/cert_error_params.cc b/pki/cert_error_params.cc index 58d4648..db72223 100644 --- a/pki/cert_error_params.cc +++ b/pki/cert_error_params.cc
@@ -15,6 +15,7 @@ #include "cert_error_params.h" #include <memory> +#include <string> #include <openssl/base.h> @@ -74,8 +75,7 @@ CertErrorParams1SizeT &operator=(const CertErrorParams1SizeT &) = delete; std::string ToDebugString() const override { - return name_ + std::string(": ") + - bssl::string_util::NumberToDecimalString(value_); + return name_ + std::string(": ") + std::to_string(value_); } private: @@ -95,10 +95,8 @@ CertErrorParams2SizeT &operator=(const CertErrorParams2SizeT &) = delete; std::string ToDebugString() const override { - return name1_ + std::string(": ") + - bssl::string_util::NumberToDecimalString(value1_) + "\n" + name2_ + - std::string(": ") + - bssl::string_util::NumberToDecimalString(value2_); + return name1_ + std::string(": ") + std::to_string(value1_) + "\n" + + name2_ + std::string(": ") + std::to_string(value2_); } private:
diff --git a/pki/string_util.cc b/pki/string_util.cc index 8baa100..8dfb2c5 100644 --- a/pki/string_util.cc +++ b/pki/string_util.cc
@@ -91,14 +91,6 @@ return out.str(); } -// TODO(bbe) get rid of this once extracted to boringssl. Everything else -// in third_party uses std::to_string -std::string NumberToDecimalString(int i) { - std::ostringstream out; - out << std::dec << i; - return out.str(); -} - std::vector<std::string_view> SplitString(std::string_view str, char split_char) { std::vector<std::string_view> out;
diff --git a/pki/string_util.h b/pki/string_util.h index 85639a7..1589c13 100644 --- a/pki/string_util.h +++ b/pki/string_util.h
@@ -60,9 +60,6 @@ // Returns a hexadecimal string encoding |data|. OPENSSL_EXPORT std::string HexEncode(Span<const uint8_t> data); -// Returns a decimal string representation of |i|. -OPENSSL_EXPORT std::string NumberToDecimalString(int i); - // Splits |str| on |split_char| returning the list of resulting strings. OPENSSL_EXPORT std::vector<std::string_view> SplitString(std::string_view str, char split_char);
diff --git a/pki/string_util_unittest.cc b/pki/string_util_unittest.cc index ce7fa23..9e2a740 100644 --- a/pki/string_util_unittest.cc +++ b/pki/string_util_unittest.cc
@@ -116,17 +116,6 @@ EXPECT_EQ(hex, "01FF02FE038081"); } -TEST(StringUtilTest, NumberToDecimalString) { - std::string number(bssl::string_util::NumberToDecimalString(42)); - EXPECT_EQ(number, "42"); - number = bssl::string_util::NumberToDecimalString(-1); - EXPECT_EQ(number, "-1"); - number = bssl::string_util::NumberToDecimalString(0); - EXPECT_EQ(number, "0"); - number = bssl::string_util::NumberToDecimalString(0xFF); - EXPECT_EQ(number, "255"); -} - TEST(StringUtilTest, SplitString) { EXPECT_EQ(bssl::string_util::SplitString("", ','), std::vector<std::string_view>());