From 4d952e65651f422db37797b4cc29757931cefa76 Mon Sep 17 00:00:00 2001 From: Akhil Thampy Date: Fri, 2 Mar 2018 16:33:43 -0600 Subject: [PATCH 1/2] utility: remove absl::strings_internal::memcasecmp usage (#2700) Signed-off-by: Akhil Thampy --- source/common/common/utility.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/common/common/utility.cc b/source/common/common/utility.cc index 23713d1ad5c69..fff53d9e1c20b 100644 --- a/source/common/common/utility.cc +++ b/source/common/common/utility.cc @@ -14,7 +14,7 @@ #include "common/common/hash.h" #include "absl/strings/ascii.h" -#include "absl/strings/internal/memutil.h" +#include "absl/strings/match.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" #include "spdlog/spdlog.h" @@ -134,7 +134,7 @@ bool StringUtil::caseCompare(absl::string_view lhs, absl::string_view rhs) { if (rhs.size() != lhs.size()) { return false; } - return absl::strings_internal::memcasecmp(rhs.data(), lhs.data(), rhs.size()) == 0; + return absl::StartsWithIgnoreCase(rhs.data(), lhs.data()); } absl::string_view StringUtil::cropRight(absl::string_view source, absl::string_view delimiter) { From 3d5a21feb7ecc51118e7724bf546ba41286f204f Mon Sep 17 00:00:00 2001 From: Akhil Thampy Date: Sat, 3 Mar 2018 19:31:59 -0600 Subject: [PATCH 2/2] utility: call absl::StartsWithIgnoreCase with string_view and not string_view.data() (#2700) Signed-off-by: Akhil Thampy --- source/common/common/utility.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/common/common/utility.cc b/source/common/common/utility.cc index fff53d9e1c20b..cdf7bf002dc81 100644 --- a/source/common/common/utility.cc +++ b/source/common/common/utility.cc @@ -134,7 +134,7 @@ bool StringUtil::caseCompare(absl::string_view lhs, absl::string_view rhs) { if (rhs.size() != lhs.size()) { return false; } - return absl::StartsWithIgnoreCase(rhs.data(), lhs.data()); + return absl::StartsWithIgnoreCase(rhs, lhs); } absl::string_view StringUtil::cropRight(absl::string_view source, absl::string_view delimiter) {