Fixed more previously-uncaught build errors.

diff --git a/src/ESI.cc b/src/ESI.cc
index 4962d5d85cb16b3af9676eb76f04bdf9432084cf..dda16d50566bd7d456c57881eba833934c0dc24c 100644 (file)
--- a/src/ESI.cc
+++ b/src/ESI.cc
@@ -1578,7 +1578,7 @@ esiLiteral::process (int dovars)
         /* Ensure variable state is clean */
 
         while (temp.getRaw()) {
-            varState->feedData(temp->unsafeBuf,temp->len);
+            varState->feedData(temp->buf,temp->len);
             temp = temp->next;
         }
 
@@ -2430,7 +2430,7 @@ esiEnableProcessing (HttpReply *rep)
              */
             return 0;
 
-        if (strstr (sctusable->content.buf(), "ESI/1.0"))
+        if (strstr (sctusable->content.unsafeBuf(), "ESI/1.0"))
             rv = 1;
 
         httpHdrScTargetDestroy (sctusable);

diff --git a/src/ESIAssign.cc b/src/ESIAssign.cc
index 67508e1697e90a44e129b5b91fb073b35d11d27b..496bdfa8a4030535c5f98697359e3210f10dcace 100644 (file)
--- a/src/ESIAssign.cc
+++ b/src/ESIAssign.cc
@@ -89,7 +89,7 @@ ESIAssign::evaluateVariable()
     variable = NULL;
 
     if (unevaluatedVariable.size()) {
-        varState->feedData(unevaluatedVariable.buf(), unevaluatedVariable.size());
+        varState->feedData(unevaluatedVariable.unsafeBuf(), unevaluatedVariable.size());
         char const *result = varState->extractChar ();
 
         /* Consider activating this, when we want to evaluate variables to a
@@ -123,7 +123,7 @@ ESIAssign::process (int dovars)
     if (!value)
         return ESI_PROCESS_COMPLETE;
 
-    varState->addVariable (name.buf(), name.size(), value);
+    varState->addVariable (name.unsafeBuf(), name.size(), value);
 
     value = NULL;
 
@@ -194,7 +194,7 @@ void
 ESIVariableExpression::eval (ESIVarState &state, char const *subref, char const *defaultOnEmpty) const
 {
     /* XXX: Implement evaluation of the expression */
-    ESISegment::ListAppend (state.getOutput(), expression.buf(), expression.size());
+    ESISegment::ListAppend (state.getOutput(), expression.unsafeBuf(), expression.size());
 }
 
 #endif /* USE_SQUID_ESI == 1 */

diff --git a/src/ESICustomParser.cc b/src/ESICustomParser.cc
index 12b364275c946929e88f981d2fa111e2e94c9461..8a5ce83816809be211a996f116e47cb2cf0e553b 100644 (file)
--- a/src/ESICustomParser.cc
+++ b/src/ESICustomParser.cc
@@ -109,7 +109,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
     }
 
     size_t openESITags (0);
-    char const *currentPos = content.buf();
+    char const *currentPos = content.unsafeBuf();
     size_t remainingCount = content.size();
     char const *tag = NULL;
 
@@ -302,7 +302,7 @@ char const *
 ESICustomParser::errorString() const
 {
     if (error.size())
-        return error.buf();
+        return error.unsafeBuf();
     else
         return "Parsing error strings not implemented";
 }

diff --git a/src/ESISegment.cc b/src/ESISegment.cc
index 8e79890b46be11eff05aa3aff8fe5c1758a2b13d..9ecd38838454f197302de79d50985c96d470cdc8 100644 (file)
--- a/src/ESISegment.cc
+++ b/src/ESISegment.cc
@@ -236,5 +236,5 @@ ESISegment::dumpOne() const
 {
     String temp;
     temp.limitInit(buf, len);
-    debugs(86, 9, "ESISegment::dumpOne: \"" << temp.buf() << "\"");
+    debugs(86, 9, "ESISegment::dumpOne: \"" << temp.unsafeBuf() << "\"");
 }

diff --git a/src/store.cc b/src/store.cc
index 14f1a9f4016581661a6fd3d22ed7a5d103a9c4ad..01c82ff7bb201dca2b68f080aa497123f9ff79ca 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -696,9 +696,9 @@ StoreEntry::setPublicKey()
 #if X_ACCELERATOR_VARY
             vary = mem_obj->getReply()->header.getList(HDR_X_ACCELERATOR_VARY);
 
-            if (vary.buf()) {
+            if (vary.unsafeBuf()) {
                 /* Again, we own this structure layout */
-                rep->header.putStr(HDR_X_ACCELERATOR_VARY, vary.buf());
+                rep->header.putStr(HDR_X_ACCELERATOR_VARY, vary.unsafeBuf());
                 vary.clean();
             }