commit e78336c21fded6d195d3ee0892894d475f77f692
author Niels Möller <nisse@webrtc.org> Fri Dec 15 14:53:13 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Dec 18 08:44:43 2017 +0000
tree 80dd9ec772f910f039c025499c5ad1006ab4199b
parent 3c8a5f275f58bc14a05f7d070d98cbfcc9c50699

Delete HttpComposeAttributes.

Bug: webrtc:6424
Change-Id: Ie11def7aed5cf7721e43f23e500bdc593385b2cb
Reviewed-on: https://webrtc-review.googlesource.com/33361
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21314}

rtc_base/httpcommon.cc

diff --git a/rtc_base/httpcommon.cc b/rtc_base/httpcommon.cc
index 7667faf..5f2112a 100644
--- a/rtc_base/httpcommon.cc
+++ b/rtc_base/httpcommon.cc
@@ -29,8 +29,6 @@
 #include "rtc_base/httpcommon.h"
 #include "rtc_base/messagedigest.h"
 #include "rtc_base/socketaddress.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/stringutils.h"
 
 namespace rtc {
 
@@ -223,33 +221,8 @@
   return false;
 }
 
-// TODO: unittest for EscapeAttribute and HttpComposeAttributes.
-
-std::string EscapeAttribute(const std::string& attribute) {
-  const size_t kMaxLength = attribute.length() * 2 + 1;
-  char* buffer = STACK_ARRAY(char, kMaxLength);
-  size_t len = escape(buffer, kMaxLength, attribute.data(), attribute.length(),
-                      "\"", '\\');
-  return std::string(buffer, len);
-}
-
 }  // anonymous namespace
 
-void HttpComposeAttributes(const HttpAttributeList& attributes, char separator,
-                           std::string* composed) {
-  std::stringstream ss;
-  for (size_t i=0; i<attributes.size(); ++i) {
-    if (i > 0) {
-      ss << separator << " ";
-    }
-    ss << attributes[i].first;
-    if (!attributes[i].second.empty()) {
-      ss << "=\"" << EscapeAttribute(attributes[i].second) << "\"";
-    }
-  }
-  *composed = ss.str();
-}
-
 void HttpParseAttributes(const char * data, size_t len,
                          HttpAttributeList& attributes) {
   size_t pos = 0;

rtc_base/stringencode.cc

diff --git a/rtc_base/stringencode.cc b/rtc_base/stringencode.cc
index d77245f..755cb2c 100644
--- a/rtc_base/stringencode.cc
+++ b/rtc_base/stringencode.cc
@@ -22,28 +22,6 @@
 // String Encoding Utilities
 /////////////////////////////////////////////////////////////////////////////
 
-size_t escape(char * buffer, size_t buflen,
-              const char * source, size_t srclen,
-              const char * illegal, char escape) {
-  RTC_DCHECK(buffer);  // TODO(grunell): estimate output size
-  if (buflen <= 0)
-    return 0;
-
-  size_t srcpos = 0, bufpos = 0;
-  while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
-    char ch = source[srcpos++];
-    if ((ch == escape) || ::strchr(illegal, ch)) {
-      if (bufpos + 2 >= buflen)
-        break;
-      buffer[bufpos++] = escape;
-    }
-    buffer[bufpos++] = ch;
-  }
-
-  buffer[bufpos] = '\0';
-  return bufpos;
-}
-
 size_t url_decode(char * buffer, size_t buflen,
                   const char * source, size_t srclen) {
   if (nullptr == buffer)

rtc_base/stringencode.h

diff --git a/rtc_base/stringencode.h b/rtc_base/stringencode.h
index 5d675a2..e5395b7 100644
--- a/rtc_base/stringencode.h
+++ b/rtc_base/stringencode.h
@@ -23,14 +23,6 @@
 // String Encoding Utilities
 //////////////////////////////////////////////////////////////////////
 
-// TODO(nisse): Used only in httpcommon.c. Delete when that file is deleted, or
-// possibly if the HttpComposeAttributes funtion can be deleted earlier.
-// Escaping prefixes illegal characters with the escape character.  Compact, but
-// illegal characters still appear in the string.
-size_t escape(char * buffer, size_t buflen,
-              const char * source, size_t srclen,
-              const char * illegal, char escape);
-
 // Note: in-place decoding (buffer == source) is allowed.
 size_t url_decode(char * buffer, size_t buflen,
                   const char * source, size_t srclen);