aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-03-27 09:05:31 -0400
committerMarcoFalke <falke.marco@gmail.com>2020-03-27 08:59:06 -0400
commitfac96fff624a3ab65209dcd3378efb6e6ab47a58 (patch)
treea9882d892ca27da176029e3f364c54d58c735ff1 /src
parente3154aacf444a29f9f5642b6c937e875ab9a2c13 (diff)
util: Remove unused itostr
Diffstat (limited to 'src')
-rw-r--r--src/sync.cpp4
-rw-r--r--src/test/fuzz/integer.cpp1
-rw-r--r--src/test/fuzz/locale.cpp5
-rw-r--r--src/util/strencodings.cpp5
-rw-r--r--src/util/strencodings.h3
5 files changed, 4 insertions, 14 deletions
diff --git a/src/sync.cpp b/src/sync.cpp
index 71657a7439..b86c57e498 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -13,9 +13,9 @@
#include <util/strencodings.h>
#include <util/threadnames.h>
-#include <system_error>
#include <map>
#include <set>
+#include <system_error>
#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 63b9296574..3ed99cd43f 100644
--- a/src/test/fuzz/integer.cpp
+++ b/src/test/fuzz/integer.cpp
@@ -97,7 +97,6 @@ void test_one_input(const std::vector<uint8_t>& 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 c8288123e8..cdad2d6fbd 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 <test/fuzz/fuzz.h>
#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
#include <tinyformat.h>
#include <util/strencodings.h>
@@ -56,7 +56,6 @@ void test_one_input(const std::vector<uint8_t>& buffer)
const int64_t random_int64 = fuzzed_data_provider.ConsumeIntegral<int64_t>();
const std::string i64tostr_without_locale = i64tostr(random_int64);
const int32_t random_int32 = fuzzed_data_provider.ConsumeIntegral<int32_t>();
- 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<double>();
const std::string strprintf_double_without_locale = strprintf("%f", random_double);
@@ -84,8 +83,6 @@ void test_one_input(const std::vector<uint8_t>& 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 eec1a52e95..9dab6af60c 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 ccc4edac12..6ce17ec01e 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);