From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 3 Mar 2015 05:16:48 +0000 (-0800)
Subject: Shuffle packerAppend() to Packer::append() method
X-Git-Tag: merge-candidate-3-v1~101^2~15^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=785b508d0eb42c470c5217f5671a922b52b7a5e7;p=thirdparty%2Fsquid.git

Shuffle packerAppend() to Packer::append() method
---

diff --git a/src/HttpBody.cc b/src/HttpBody.cc
index 27d2f863a9..7b2b267267 100644
--- a/src/HttpBody.cc
+++ b/src/HttpBody.cc
@@ -44,6 +44,6 @@ HttpBody::packInto(Packer * p) const
     assert(p);
 
     if (mb->contentSize())
-        packerAppend(p, mb->content(), mb->contentSize());
+        p->append(mb->content(), mb->contentSize());
 }
 
diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index 7a8bfdc39e..80d7e19905 100644
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -309,7 +309,7 @@ HttpHdrRange::packInto(Packer * packer) const
 
     while (pos != end()) {
         if (pos != begin())
-            packerAppend(packer, ",", 1);
+            packer->append(",", 1);
 
         (*pos)->packInto(packer);
 
diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 0095eaf31a..d71f3cf750 100644
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -765,8 +765,8 @@ HttpHeader::packInto(Packer * p, bool mask_sensitive_info) const
             break;
         }
         if (maskThisEntry) {
-            packerAppend(p, e->name.rawBuf(), e->name.size());
-            packerAppend(p, ": ** NOT DISPLAYED **\r\n", 23);
+            p->append(e->name.rawBuf(), e->name.size());
+            p->append(": ** NOT DISPLAYED **\r\n", 23);
         } else {
             e->packInto(p);
         }
@@ -1685,10 +1685,10 @@ void
 HttpHeaderEntry::packInto(Packer * p) const
 {
     assert(p);
-    packerAppend(p, name.rawBuf(), name.size());
-    packerAppend(p, ": ", 2);
-    packerAppend(p, value.rawBuf(), value.size());
-    packerAppend(p, "\r\n", 2);
+    p->append(name.rawBuf(), name.size());
+    p->append(": ", 2);
+    p->append(value.rawBuf(), value.size());
+    p->append("\r\n", 2);
 }
 
 int
diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc
index 59185ebb22..527a53c173 100644
--- a/src/HttpMsg.cc
+++ b/src/HttpMsg.cc
@@ -320,7 +320,7 @@ void HttpMsg::packInto(Packer *p, bool full_uri) const
 {
     packFirstLineInto(p, full_uri);
     header.packInto(p);
-    packerAppend(p, "\r\n", 2);
+    p->append("\r\n", 2);
 }
 
 void HttpMsg::hdrCacheInit()
diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index 22a2ab0f68..f599796d29 100644
--- a/src/HttpReply.cc
+++ b/src/HttpReply.cc
@@ -112,7 +112,7 @@ HttpReply::packHeadersInto(Packer * p) const
 {
     sline.packInto(p);
     header.packInto(p);
-    packerAppend(p, "\r\n", 2);
+    p->append("\r\n", 2);
 }
 
 void
diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 9f60ad7cc8..942a2e8470 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -383,7 +383,7 @@ HttpRequest::pack(Packer * p)
     /* headers */
     header.packInto(p);
     /* trailer */
-    packerAppend(p, "\r\n", 2);
+    p->append("\r\n", 2);
 }
 
 /*
diff --git a/src/Packer.cc b/src/Packer.cc
index a39b6303fe..b9f7675459 100644
--- a/src/Packer.cc
+++ b/src/Packer.cc
@@ -88,7 +88,7 @@ void
 packerToStoreInit(Packer * p, StoreEntry * e)
 {
     assert(p && e);
-    p->append = (append_f) store_append;
+    p->append_ = (append_f) store_append;
     p->packer_vprintf = (vprintf_f) store_vprintf;
     p->real_handler = e;
     e->buffer();
@@ -99,28 +99,27 @@ void
 packerToMemInit(Packer * p, MemBuf * mb)
 {
     assert(p && mb);
-    p->append = (append_f) memBuf_append;
+    p->append_ = (append_f) memBuf_append;
     p->packer_vprintf = (vprintf_f) memBuf_vprintf;
     p->real_handler = mb;
 }
 
 Packer::~Packer()
 {
-    if (append == (append_f) store_append && real_handler)
+    if (append_ == (append_f) store_append && real_handler)
         static_cast<StoreEntry*>(real_handler)->flush();
 
     /* it is not really necessary to do this, but, just in case... */
-    append = NULL;
+    append_ = NULL;
     packer_vprintf = NULL;
     real_handler = NULL;
 }
 
 void
-packerAppend(Packer * p, const char *buf, int sz)
+Packer::append(const char *buf, int sz)
 {
-    assert(p);
-    assert(p->real_handler && p->append);
-    p->append(p->real_handler, buf, sz);
+    assert(real_handler && append_);
+    append_(real_handler, buf, sz);
 }
 
 void
diff --git a/src/Packer.h b/src/Packer.h
index 0cba846876..964913aad2 100644
--- a/src/Packer.h
+++ b/src/Packer.h
@@ -24,14 +24,14 @@ class Packer
 
 public:
     virtual ~Packer();
+    virtual void append(const char *buf, int size);
 
     /* protected, use interface functions instead */
-    append_f append;
+    append_f append_;
     vprintf_f packer_vprintf;
     void *real_handler;     /* first parameter to real append and vprintf */
 };
 
-void packerAppend(Packer * p, const char *buf, int size);
 void packerPrintf(Packer * p, const char *fmt,...) PRINTF_FORMAT_ARG2;
 
 #endif /* SQUID_PACKER_H */