From: Kefu Chai <kchai@redhat.com>
Date: Mon, 26 Jul 2021 07:07:48 +0000 (+0800)
Subject: common,mon: drop strict_sistrtoll()
X-Git-Tag: v17.1.0~1287^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d22af9316b412d630befdfcae86686dc8f724d8;p=ceph.git

common,mon: drop strict_sistrtoll()

strict_sistrtoll() is but an alias of strict_si_cast<uint64_t>(..),
let's just drop the former. there are way too many thin wrappers in
strtol.{h,cc}. they don't offer lots of benefit to us.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/common/strtol.cc b/src/common/strtol.cc
index b0aa04982ce0..ff4040b18c21 100644
--- a/src/common/strtol.cc
+++ b/src/common/strtol.cc
@@ -282,13 +282,3 @@ template long strict_si_cast<long>(std::string_view str, std::string *err);
 template long long strict_si_cast<long long>(std::string_view str, std::string *err);
 template uint64_t strict_si_cast<uint64_t>(std::string_view str, std::string *err);
 template uint32_t strict_si_cast<uint32_t>(std::string_view str, std::string *err);
-
-uint64_t strict_sistrtoll(std::string_view str, std::string *err)
-{
-  return strict_si_cast<uint64_t>(str, err);
-}
-
-uint64_t strict_sistrtoll(const char *str, std::string *err)
-{
-  return strict_si_cast<uint64_t>(str, err);
-}
diff --git a/src/common/strtol.h b/src/common/strtol.h
index cdcac262e7a0..92cca690de97 100644
--- a/src/common/strtol.h
+++ b/src/common/strtol.h
@@ -84,8 +84,6 @@ uint64_t strict_iecstrtoll(const char *str, std::string *err);
 template<typename T>
 T strict_iec_cast(std::string_view str, std::string *err);
 
-uint64_t strict_sistrtoll(const char *str, std::string *err);
-
 template<typename T>
 T strict_si_cast(std::string_view str, std::string *err);
 
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0b4bc5580c5f..d7ece669c34f 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -13433,7 +13433,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     string tss;
     int64_t value;
     if (field == "max_objects") {
-      value = strict_sistrtoll(val.c_str(), &tss);
+      value = strict_si_cast<uint64_t>(val, &tss);
     } else if (field == "max_bytes") {
       value = strict_iecstrtoll(val.c_str(), &tss);
     } else {
diff --git a/src/test/strtol.cc b/src/test/strtol.cc
index 901f33cf8ceb..ec3f6715b8e2 100644
--- a/src/test/strtol.cc
+++ b/src/test/strtol.cc
@@ -278,7 +278,7 @@ TEST(StrictIECCast, Error) {
 static void test_strict_sistrtoll(const char *str)
 {
   std::string err;
-  strict_sistrtoll(str, &err);
+  strict_si_cast<uint64_t>(str, &err);
   ASSERT_EQ(err, "");
 }
 
@@ -289,7 +289,7 @@ static void test_strict_sistrtoll_units(const std::string& foo,
   s.append(u);
   const char *str = s.c_str();
   std::string err;
-  uint64_t r = strict_sistrtoll(str, &err);
+  uint64_t r = strict_si_cast<uint64_t>(str, &err);
   ASSERT_EQ(err, "");
 
   str = foo.c_str();
@@ -327,7 +327,7 @@ TEST(SIStrToLL, WithoutUnits) {
 static void test_strict_sistrtoll_err(const char *str)
 {
   std::string err;
-  strict_sistrtoll(str, &err);
+  strict_si_cast<uint64_t>(str, &err);
   ASSERT_NE(err, "");
 }