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 b0aa04982ce0ffab3ace8868c4d1e48b194dac22..ff4040b18c21e7547a885cb49c8c7a0bb1b6f1ab 100644 (file)
--- 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 cdcac262e7a03c491b282b3268ab2ce6d01e79dd..92cca690de97148a5a7b3d61f4f08f12b6e4fae7 100644 (file)
--- 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 0b4bc5580c5fda415082dbe9dc8b63f8627f0922..d7ece669c34f1b8700438934dab6e599d8d86464 100644 (file)
--- 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 901f33cf8ceb7cb5674f56cfdf28ab29a8f4ed42..ec3f6715b8e249fac2091a838d328a2f034d3cd6 100644 (file)
--- 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, "");
 }