From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 13 Oct 2008 11:29:06 +0000 (+1300)
Subject: Remove several unnecessary uses of putStrf and a compile error
X-Git-Tag: SQUID_3_2_0_1~1409
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70d1b64c05b0453cbd5541db8095a12bf390b613;p=thirdparty%2Fsquid.git

Remove several unnecessary uses of putStrf and a compile error
---

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 21f2926a29..50f40191d9 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -866,13 +866,13 @@ ErrorState::BuildHttpReply()
          */
         if(!Config.errorDirectory) {
             /* We 'negotiated' this ONLY from the Accept-Language. */
-            httpHeaderDelById(&rep->header, HDR_VARY);
-            httpHeaderPutStrf(&rep->header, HDR_VARY, "Accept-Language");
+            rep->header.delById(HDR_VARY);
+            rep->header.putStr(HDR_VARY, "Accept-Language");
         }
 
         /* add the Content-Language header according to RFC section 14.12 */
         if(err_language) {
-            httpHeaderPutStrf(&rep->header, HDR_CONTENT_LANGUAGE, "%s", err_language);
+            rep->header.putStr(HDR_CONTENT_LANGUAGE, err_language);
         }
         else
 #endif /* USE_ERROR_LOCALES */
@@ -880,7 +880,7 @@ ErrorState::BuildHttpReply()
             /* default templates are in English */
             /* language is known unless error_directory override used */
             if(!Config.errorDirectory)
-                httpHeaderPutStrf(&rep->header, HDR_CONTENT_LANGUAGE, "en");
+                rep->header.putStr(HDR_CONTENT_LANGUAGE, "en");
         }
 
         httpBodySet(&rep->body, content);