From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 31 Jul 2015 14:14:34 +0000 (+0200)
Subject: Moved some users of httpHeaderIdByNameDef to the SBuf variant
X-Git-Tag: merge-candidate-3-v1~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e9ed011967cd1ad7afbcadc6e25fb3093ebb531;p=thirdparty%2Fsquid.git

Moved some users of httpHeaderIdByNameDef to the SBuf variant
---

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 568625e431..009972bf25 100644
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -1111,7 +1111,7 @@ HttpHeader::getByNameIfPresent(const char *name, String &result) const
     assert(name);
 
     /* First try the quick path */
-    id = httpHeaderIdByNameDef(name, strlen(name));
+    id = httpHeaderIdByNameDef(SBuf(name));
 
     if (id != -1) {
         if (!has(id))
@@ -1841,6 +1841,7 @@ httpHeaderStoreReport(StoreEntry * e)
     storeAppendPrintf(e, "Hdr Fields Parsed: %d\n", HeaderEntryParsedCount);
 }
 
+// (ab)used by other modules.
 http_hdr_type
 httpHeaderIdByName(const char *name, size_t name_len, const HttpHeaderFieldInfo * info, int end)
 {
diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index fccf202e5c..0f39f64030 100644
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -456,7 +456,7 @@ HeaderManglers::dumpReplacement(StoreEntry * entry, const char *name) const
 headerMangler *
 HeaderManglers::track(const char *name)
 {
-    int id = httpHeaderIdByNameDef(name, strlen(name));
+    int id = httpHeaderIdByNameDef(SBuf(name));
 
     if (id == HDR_BAD_HDR) { // special keyword or a custom header
         if (strcmp(name, "All") == 0)
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 59cb9a41b9..93a35b2097 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -4608,7 +4608,7 @@ static void parse_HeaderWithAclList(HeaderWithAclList **headers)
     }
     HeaderWithAcl hwa;
     hwa.fieldName = fn;
-    hwa.fieldId = httpHeaderIdByNameDef(fn, strlen(fn));
+    hwa.fieldId = httpHeaderIdByNameDef(SBuf(fn));
     if (hwa.fieldId == HDR_BAD_HDR)
         hwa.fieldId = HDR_OTHER;
 
diff --git a/src/external_acl.cc b/src/external_acl.cc
index 1dc0c5b9ad..23aee92b9d 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -244,7 +244,7 @@ parse_header_token(external_acl_format::Pointer format, char *header, const Form
     }
 
     format->header = xstrdup(header);
-    format->header_id = httpHeaderIdByNameDef(header, strlen(header));
+    format->header_id = httpHeaderIdByNameDef(SBuf(header));
 }
 
 void