From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 23 Apr 2014 18:39:04 +0000 (-0700)
Subject: SBuf: convert CARP key from SquidString
X-Git-Tag: SQUID_3_5_0_1~266
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2128aa19d1951ec239f261dc05aabf8f26dc95dc;p=thirdparty%2Fsquid.git

SBuf: convert CARP key from SquidString
---

diff --git a/src/carp.cc b/src/carp.cc
index 10958250c4..7e38996775 100644
--- a/src/carp.cc
+++ b/src/carp.cc
@@ -185,7 +185,7 @@ carpSelectParent(HttpRequest * request)
 
     /* select CachePeer */
     for (k = 0; k < n_carp_peers; ++k) {
-        String key;
+        SBuf key;
         tp = carp_peers[k];
         if (tp->options.carp_key.set) {
             //this code follows urlCanonical's pattern.
@@ -194,7 +194,7 @@ carpSelectParent(HttpRequest * request)
                 // temporary, until bug 1961 URL handling is fixed.
                 const AnyP::UriScheme sch(request->protocol);
                 key.append(sch.c_str());
-                if (key.size()) //if the scheme is not empty
+                if (key.length()) //if the scheme is not empty
                     key.append("://");
             }
             if (tp->options.carp_key.host) {
@@ -206,26 +206,26 @@ carpSelectParent(HttpRequest * request)
                 key.append(portbuf);
             }
             if (tp->options.carp_key.path) {
-                String::size_type pos;
-                if ((pos=request->urlpath.find('?'))!=String::npos)
+                SBuf::size_type pos;
+                if ((pos=request->urlpath.find('?'))!=SBuf::npos)
                     key.append(request->urlpath.substr(0,pos));
                 else
                     key.append(request->urlpath);
             }
             if (tp->options.carp_key.params) {
-                String::size_type pos;
-                if ((pos=request->urlpath.find('?'))!=String::npos)
-                    key.append(request->urlpath.substr(pos,request->urlpath.size()));
+                SBuf::size_type pos;
+                if ((pos=request->urlpath.find('?'))!=SBuf::npos)
+                    key.append(request->urlpath.substr(pos, request->urlpath.size()));
             }
         }
         // if the url-based key is empty, e.g. because the user is
         // asking to balance on the path but the request doesn't supply any,
         // then fall back to canonical URL
 
-        if (key.size()==0)
-            key=urlCanonical(request);
+        if (key.isEmpty())
+            key=SBuf(urlCanonical(request));
 
-        for (const char *c = key.rawBuf(), *e=key.rawBuf()+key.size(); c < e; ++c)
+        for (const char *c = key.rawContent(), *e=key.rawContent()+key.length(); c < e; ++c)
             user_hash += ROTATE_LEFT(user_hash, 19) + *c;
         combined_hash = (user_hash ^ tp->carp.hash);
         combined_hash += combined_hash * 0x62531965;