From 650a0c936300163344486e08226b3e4ae87fcf7f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 26 Jul 2021 15:00:40 +0800 Subject: [PATCH] common/strtol: drop strict_strto*(const char*,..) they are but proxies to strict_strto*(string_view, ...). and their callers can just call the latter without any change. so drop these proxies. Signed-off-by: Kefu Chai --- src/common/strtol.cc | 15 --------------- src/common/strtol.h | 6 ++---- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/common/strtol.cc b/src/common/strtol.cc index bba31f2a58767..b0aa04982ce0f 100644 --- a/src/common/strtol.cc +++ b/src/common/strtol.cc @@ -55,11 +55,6 @@ long long strict_strtoll(std::string_view str, int base, std::string *err) return ret; } -long long strict_strtoll(const char *str, int base, std::string *err) -{ - return strict_strtoll(std::string_view(str), base, err); -} - int strict_strtol(std::string_view str, int base, std::string *err) { long long ret = strict_strtoll(str, base, err); @@ -107,11 +102,6 @@ double strict_strtod(std::string_view str, std::string *err) return ret; } -double strict_strtod(const char *str, std::string *err) -{ - return strict_strtod(std::string_view(str), err); -} - float strict_strtof(std::string_view str, std::string *err) { char *endptr; @@ -140,11 +130,6 @@ float strict_strtof(std::string_view str, std::string *err) return ret; } -float strict_strtof(const char *str, std::string *err) -{ - return strict_strtof(std::string_view(str), err); -} - template T strict_iec_cast(std::string_view str, std::string *err) { diff --git a/src/common/strtol.h b/src/common/strtol.h index 91d2fac9f075f..cdcac262e7a03 100644 --- a/src/common/strtol.h +++ b/src/common/strtol.h @@ -72,14 +72,12 @@ auto consume(std::string_view& s, int base = 10) bool strict_strtob(const char* str, std::string *err); long long strict_strtoll(std::string_view str, int base, std::string *err); -long long strict_strtoll(const char *str, int base, std::string *err); int strict_strtol(std::string_view str, int base, std::string *err); -int strict_strtol(const char *str, int base, std::string *err); -double strict_strtod(const char *str, std::string *err); +double strict_strtod(std::string_view str, std::string *err); -float strict_strtof(const char *str, std::string *err); +float strict_strtof(std::string_view str, std::string *err); uint64_t strict_iecstrtoll(const char *str, std::string *err); -- 2.39.5