[trafficserver] branch master updated: Merge url_scheme_get into only calling class method

[shinrich]

This is an automated email from the ASF dual-hosted git repository.

shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 9c4bfa3  Merge url_scheme_get into only calling class method
9c4bfa3 is described below

commit 9c4bfa34d69d1017c47dad3712be7136162f1f24
Author: Susan Hinrichs <shinr...@oath.com>
AuthorDate: Thu Feb 21 17:07:07 2019 +0000

    Merge url_scheme_get into only calling class method
---
 proxy/hdrs/URL.cc | 18 ------------------
 proxy/hdrs/URL.h  | 20 +++++++++++++++++---
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index 8f94329..dccc527 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -688,24 +688,6 @@ url_string_get_buf(URLImpl *url, char *dstbuf, int 
dstbuf_size, int *length)
   -------------------------------------------------------------------------*/
 
 const char *
-url_scheme_get(URLImpl *url, int *length)
-{
-  const char *str;
-
-  if (url->m_scheme_wks_idx >= 0) {
-    str     = hdrtoken_index_to_wks(url->m_scheme_wks_idx);
-    *length = hdrtoken_index_to_length(url->m_scheme_wks_idx);
-  } else {
-    str     = url->m_ptr_scheme;
-    *length = url->m_len_scheme;
-  }
-  return str;
-}
-
-/*-------------------------------------------------------------------------
-  -------------------------------------------------------------------------*/
-
-const char *
 url_user_get(URLImpl *url, int *length)
 {
   *length = url->m_len_user;
diff --git a/proxy/hdrs/URL.h b/proxy/hdrs/URL.h
index 31abaa1..1524a5a 100644
--- a/proxy/hdrs/URL.h
+++ b/proxy/hdrs/URL.h
@@ -173,7 +173,6 @@ char *url_string_get_ref(HdrHeap *heap, URLImpl *url, int 
*length);
 void url_called_set(URLImpl *url);
 char *url_string_get_buf(URLImpl *url, char *dstbuf, int dstbuf_size, int 
*length);
 
-const char *url_scheme_get(URLImpl *url, int *length);
 void url_CryptoHash_get(const URLImpl *url, CryptoHash *hash, 
cache_generation_t generation = -1);
 void url_host_CryptoHash_get(URLImpl *url, CryptoHash *hash);
 const char *url_scheme_set(HdrHeap *heap, URLImpl *url, const char *value, int 
value_wks_idx, int length, bool copy_string);
@@ -249,6 +248,7 @@ public:
   void host_hash_get(CryptoHash *hash);
 
   const char *scheme_get(int *length);
+  const std::string_view scheme_get();
   int scheme_get_wksidx();
   void scheme_set(const char *value, int length);
 
@@ -444,11 +444,25 @@ URL::host_hash_get(CryptoHash *hash)
 /*-------------------------------------------------------------------------
   -------------------------------------------------------------------------*/
 
+inline const std::string_view
+URL::scheme_get()
+{
+  ink_assert(valid());
+
+  if (m_url_impl->m_scheme_wks_idx >= 0) {
+    return 
std::string_view{hdrtoken_index_to_wks(m_url_impl->m_scheme_wks_idx),
+                            
static_cast<size_t>(hdrtoken_index_to_length(m_url_impl->m_scheme_wks_idx))};
+  } else {
+    return std::string_view{m_url_impl->m_ptr_scheme, 
m_url_impl->m_len_scheme};
+  }
+}
+
 inline const char *
 URL::scheme_get(int *length)
 {
-  ink_assert(valid());
-  return (url_scheme_get(m_url_impl, length));
+  std::string_view ret = this->scheme_get();
+  *length              = ret.size();
+  return ret.data();
 }
 
 inline int