From fac96fff624a3ab65209dcd3378efb6e6ab47a58 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 27 Mar 2020 09:05:31 -0400 Subject: [PATCH] util: Remove unused itostr --- src/sync.cpp | 4 ++-- src/test/fuzz/integer.cpp | 1 - src/test/fuzz/locale.cpp | 5 +---- src/util/strencodings.cpp | 5 ----- src/util/strencodings.h | 3 +-- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/sync.cpp b/src/sync.cpp index 71657a74399..b86c57e4981 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -13,9 +13,9 @@ #include #include -#include #include #include +#include #ifdef DEBUG_LOCKCONTENTION #if !defined(HAVE_THREAD_LOCAL) @@ -57,7 +57,7 @@ struct CLockLocation { { return strprintf( "%s %s:%s%s (in thread %s)", - mutexName, sourceFile, itostr(sourceLine), (fTry ? " (TRY)" : ""), m_thread_name); + mutexName, sourceFile, sourceLine, (fTry ? " (TRY)" : ""), m_thread_name); } std::string Name() const diff --git a/src/test/fuzz/integer.cpp b/src/test/fuzz/integer.cpp index 63b9296574c..3ed99cd43f3 100644 --- a/src/test/fuzz/integer.cpp +++ b/src/test/fuzz/integer.cpp @@ -97,7 +97,6 @@ void test_one_input(const std::vector& buffer) (void)IsDigit(ch); (void)IsSpace(ch); (void)IsSwitchChar(ch); - (void)itostr(i32); (void)memusage::DynamicUsage(ch); (void)memusage::DynamicUsage(i16); (void)memusage::DynamicUsage(i32); diff --git a/src/test/fuzz/locale.cpp b/src/test/fuzz/locale.cpp index c8288123e83..cdad2d6fbd5 100644 --- a/src/test/fuzz/locale.cpp +++ b/src/test/fuzz/locale.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include #include +#include #include #include @@ -56,7 +56,6 @@ void test_one_input(const std::vector& buffer) const int64_t random_int64 = fuzzed_data_provider.ConsumeIntegral(); const std::string i64tostr_without_locale = i64tostr(random_int64); const int32_t random_int32 = fuzzed_data_provider.ConsumeIntegral(); - const std::string itostr_without_locale = itostr(random_int32); const std::string strprintf_int_without_locale = strprintf("%d", random_int64); const double random_double = fuzzed_data_provider.ConsumeFloatingPoint(); const std::string strprintf_double_without_locale = strprintf("%f", random_double); @@ -84,8 +83,6 @@ void test_one_input(const std::vector& buffer) assert(atoi_without_locale == atoi_with_locale); const std::string i64tostr_with_locale = i64tostr(random_int64); assert(i64tostr_without_locale == i64tostr_with_locale); - const std::string itostr_with_locale = itostr(random_int32); - assert(itostr_without_locale == itostr_with_locale); const std::string strprintf_int_with_locale = strprintf("%d", random_int64); assert(strprintf_int_without_locale == strprintf_int_with_locale); const std::string strprintf_double_with_locale = strprintf("%f", random_double); diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp index eec1a52e958..9dab6af60c5 100644 --- a/src/util/strencodings.cpp +++ b/src/util/strencodings.cpp @@ -412,11 +412,6 @@ std::string i64tostr(int64_t n) return strprintf("%d", n); } -std::string itostr(int n) -{ - return strprintf("%d", n); -} - int64_t atoi64(const char* psz) { #ifdef _MSC_VER diff --git a/src/util/strencodings.h b/src/util/strencodings.h index ccc4edac120..6ce17ec01ef 100644 --- a/src/util/strencodings.h +++ b/src/util/strencodings.h @@ -54,9 +54,8 @@ std::string DecodeBase32(const std::string& str, bool* pf_invalid = nullptr); std::string EncodeBase32(const unsigned char* pch, size_t len); std::string EncodeBase32(const std::string& str); -void SplitHostPort(std::string in, int &portOut, std::string &hostOut); +void SplitHostPort(std::string in, int& portOut, std::string& hostOut); std::string i64tostr(int64_t n); -std::string itostr(int n); int64_t atoi64(const char* psz); int64_t atoi64(const std::string& str); int atoi(const std::string& str);