foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 09:46:52 -05:00
Code Issues Activity

util: remove unused c-string variant of atoi64()

Browse source
This commit is contained in:
Sebastian Falbesoner 2020-08-17 17:34:06 +02:00
parent 1bc8e8eae2
commit 71e0f07e9c
4 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/test/fuzz/locale.cpp
View file

@ -52,7 +52,6 @@ void test_one_input(const std::vector<uint8_t>& buffer)
const bool parseint64_without_locale = ParseInt64(random_string, &parseint64_out_without_locale); const bool parseint64_without_locale = ParseInt64(random_string, &parseint64_out_without_locale);
const int64_t atoi64_without_locale = atoi64(random_string); const int64_t atoi64_without_locale = atoi64(random_string);
const int atoi_without_locale = atoi(random_string); const int atoi_without_locale = atoi(random_string);
const int64_t atoi64c_without_locale = atoi64(random_string.c_str());
const int64_t random_int64 = fuzzed_data_provider.ConsumeIntegral<int64_t>(); const int64_t random_int64 = fuzzed_data_provider.ConsumeIntegral<int64_t>();
const std::string tostring_without_locale = ToString(random_int64); const std::string tostring_without_locale = ToString(random_int64);
// The variable `random_int32` is no longer used, but the harness still needs to // The variable `random_int32` is no longer used, but the harness still needs to
@ -80,8 +79,6 @@ void test_one_input(const std::vector<uint8_t>& buffer)
} }
const int64_t atoi64_with_locale = atoi64(random_string); const int64_t atoi64_with_locale = atoi64(random_string);
assert(atoi64_without_locale == atoi64_with_locale); assert(atoi64_without_locale == atoi64_with_locale);
const int64_t atoi64c_with_locale = atoi64(random_string.c_str());
assert(atoi64c_without_locale == atoi64c_with_locale);
const int atoi_with_locale = atoi(random_string); const int atoi_with_locale = atoi(random_string);
assert(atoi_without_locale == atoi_with_locale); assert(atoi_without_locale == atoi_with_locale);
const std::string tostring_with_locale = ToString(random_int64); const std::string tostring_with_locale = ToString(random_int64);

9
src/util/strencodings.cpp
View file

@ -407,15 +407,6 @@ std::string FormatParagraph(const std::string& in, size_t width, size_t indent)
return out.str(); return out.str();
} }
int64_t atoi64(const char* psz)
{
#ifdef _MSC_VER
return _atoi64(psz);
#else
return strtoll(psz, nullptr, 10);
#endif
}
int64_t atoi64(const std::string& str) int64_t atoi64(const std::string& str)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER

1
src/util/strencodings.h
View file

@ -56,7 +56,6 @@ std::string EncodeBase32(const unsigned char* pch, size_t len);
std::string EncodeBase32(const std::string& str); 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);
int64_t atoi64(const char* psz);
int64_t atoi64(const std::string& str); int64_t atoi64(const std::string& str);
int atoi(const std::string& str); int atoi(const std::string& str);

2
src/wallet/wallet.h
View file

@ -227,7 +227,7 @@ static inline void ReadOrderPos(int64_t& nOrderPos, mapValue_t& mapValue)
nOrderPos = -1; // TODO: calculate elsewhere nOrderPos = -1; // TODO: calculate elsewhere
return; return;
} }
nOrderPos = atoi64(mapValue["n"].c_str()); nOrderPos = atoi64(mapValue["n"]);
} }