commit fd6a4d6e2af3dae3d57bd21ad346281e5d8f62ce
author Ali Tofigh <alito@webrtc.org> Thu Mar 31 10:36:48 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Apr 04 12:30:56 2022 +0000
tree 1ce119a342b057466643ff58b326653150e6295b
parent f2599a7f4374cb2d5b469c4d6d8e3250bad0a128

Adopt absl::string_view in rtc_base/string_encode.*

Bug: webrtc:13579
Change-Id: If52108d151a12bde0e8d552ce7940948c08cef3a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256812
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Ali Tofigh <alito@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36424}

rtc_base/string_encode.cc

diff --git a/rtc_base/string_encode.cc b/rtc_base/string_encode.cc
index fa99c7a..136b853 100644
--- a/rtc_base/string_encode.cc
+++ b/rtc_base/string_encode.cc
@@ -13,6 +13,7 @@
 #include <cstdio>
 
 #include "absl/strings/string_view.h"
+#include "api/array_view.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 
@@ -52,16 +53,16 @@
 // hex_encode shows the hex representation of binary data in ascii, with
 // `delimiter` between bytes, or none if `delimiter` == 0.
 void hex_encode_with_delimiter(char* buffer,
-                               const char* csource,
-                               size_t srclen,
+                               absl::string_view source,
                                char delimiter) {
   RTC_DCHECK(buffer);
 
   // Init and check bounds.
   const unsigned char* bsource =
-      reinterpret_cast<const unsigned char*>(csource);
+      reinterpret_cast<const unsigned char*>(source.data());
   size_t srcpos = 0, bufpos = 0;
 
+  size_t srclen = source.length();
   while (srcpos < srclen) {
     unsigned char ch = bsource[srcpos++];
     buffer[bufpos] = hex_encode((ch >> 4) & 0xF);
@@ -79,42 +80,29 @@
 }  // namespace
 
 std::string hex_encode(absl::string_view str) {
-  return hex_encode(str.data(), str.size());
+  return hex_encode_with_delimiter(str, 0);
 }
 
-std::string hex_encode(const char* source, size_t srclen) {
-  return hex_encode_with_delimiter(source, srclen, 0);
-}
-
-std::string hex_encode_with_delimiter(const char* source,
-                                      size_t srclen,
+std::string hex_encode_with_delimiter(absl::string_view source,
                                       char delimiter) {
-  std::string s(hex_encode_output_length(srclen, delimiter), 0);
-  hex_encode_with_delimiter(&s[0], source, srclen, delimiter);
+  std::string s(hex_encode_output_length(source.length(), delimiter), 0);
+  hex_encode_with_delimiter(&s[0], source, delimiter);
   return s;
 }
 
-size_t hex_decode(char* cbuffer,
-                  size_t buflen,
-                  const char* source,
-                  size_t srclen) {
-  return hex_decode_with_delimiter(cbuffer, buflen, source, srclen, 0);
-}
-
-size_t hex_decode_with_delimiter(char* cbuffer,
-                                 size_t buflen,
-                                 const char* source,
-                                 size_t srclen,
+size_t hex_decode_with_delimiter(ArrayView<char> cbuffer,
+                                 absl::string_view source,
                                  char delimiter) {
-  RTC_DCHECK(cbuffer);  // TODO(kwiberg): estimate output size
-  if (buflen == 0)
+  if (cbuffer.empty())
     return 0;
 
   // Init and bounds check.
-  unsigned char* bbuffer = reinterpret_cast<unsigned char*>(cbuffer);
+  unsigned char* bbuffer = reinterpret_cast<unsigned char*>(cbuffer.data());
   size_t srcpos = 0, bufpos = 0;
+  size_t srclen = source.length();
+
   size_t needed = (delimiter) ? (srclen + 1) / 3 : srclen / 2;
-  if (buflen < needed)
+  if (cbuffer.size() < needed)
     return 0;
 
   while (srcpos < srclen) {
@@ -142,15 +130,16 @@
   return bufpos;
 }
 
-size_t hex_decode(char* buffer, size_t buflen, absl::string_view source) {
-  return hex_decode_with_delimiter(buffer, buflen, source, 0);
-}
 size_t hex_decode_with_delimiter(char* buffer,
                                  size_t buflen,
                                  absl::string_view source,
                                  char delimiter) {
-  return hex_decode_with_delimiter(buffer, buflen, source.data(),
-                                   source.length(), delimiter);
+  return hex_decode_with_delimiter(ArrayView<char>(buffer, buflen), source,
+                                   delimiter);
+}
+
+size_t hex_decode(ArrayView<char> buffer, absl::string_view source) {
+  return hex_decode_with_delimiter(buffer, source, 0);
 }
 
 size_t tokenize(absl::string_view source,
@@ -243,11 +232,11 @@
   return b ? "true" : "false";
 }
 
-std::string ToString(const char* const s) {
+std::string ToString(absl::string_view s) {
   return std::string(s);
 }
 
-std::string ToString(absl::string_view s) {
+std::string ToString(const char* s) {
   return std::string(s);
 }
 
@@ -321,7 +310,7 @@
   return std::string(&buf[0], len);
 }
 
-bool FromString(const std::string& s, bool* b) {
+bool FromString(absl::string_view s, bool* b) {
   if (s == "false") {
     *b = false;
     return true;