From: Kefu Chai <tchaikov@gmail.com>
Date: Sat, 21 Apr 2018 14:33:36 +0000 (+0800)
Subject: Merge pull request #21560 from jan--f/fix_strtoll_interface
X-Git-Tag: v13.1.0~156
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c477b199af93837d01c9469f359867a4c39280d4;p=ceph.git

Merge pull request #21560 from jan--f/fix_strtoll_interface

common/strtoll: remove superfluous const modifier

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

c477b199af93837d01c9469f359867a4c39280d4
diff --cc src/common/strtol.cc
index 7f7e78bfbd0db,df369936911d1..9b437596941fb
--- a/src/common/strtol.cc
+++ b/src/common/strtol.cc
@@@ -22,8 -22,16 +22,8 @@@
  
  using std::ostringstream;
  
- long long strict_strtoll(const std::string_view str, int base, std::string *err)
+ long long strict_strtoll(std::string_view str, int base, std::string *err)
  {
 -  ostringstream errStr;
 -  if (auto invalid = str.find_first_not_of("0123456789-+");
 -      invalid != std::string_view::npos ||
 -      invalid == 0) {
 -    errStr << "The option value '" << str << "' contains invalid digits";
 -    *err =  errStr.str();
 -    return 0;
 -  }
    char *endptr;
    errno = 0; /* To distinguish success/failure after call (see man page) */
    long long ret = strtoll(str.data(), &endptr, base);
@@@ -46,8 -56,9 +46,8 @@@ long long strict_strtoll(const char *st
    return strict_strtoll(std::string_view(str), base, err);
  }
  
- int strict_strtol(const std::string_view str, int base, std::string *err)
+ int strict_strtol(std::string_view str, int base, std::string *err)
  {
 -  ostringstream errStr;
    long long ret = strict_strtoll(str, base, err);
    if (!err->empty())
      return 0;
@@@ -65,9 -75,10 +65,9 @@@ int strict_strtol(const char *str, int 
    return strict_strtol(std::string_view(str), base, err);
  }
  
- double strict_strtod(const std::string_view str, std::string *err)
+ double strict_strtod(std::string_view str, std::string *err)
  {
    char *endptr;
 -  ostringstream oss;
    errno = 0; /* To distinguish success/failure after call (see man page) */
    double ret = strtod(str.data(), &endptr);
    if (errno == ERANGE) {
@@@ -98,9 -106,10 +98,9 @@@ double strict_strtod(const char *str, s
    return strict_strtod(std::string_view(str), err);
  }
  
- float strict_strtof(const std::string_view str, std::string *err)
+ float strict_strtof(std::string_view str, std::string *err)
  {
    char *endptr;
 -  ostringstream oss;
    errno = 0; /* To distinguish success/failure after call (see man page) */
    float ret = strtof(str.data(), &endptr);
    if (errno == ERANGE) {