From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 26 Apr 2015 16:41:06 +0000 (-0700)
Subject: Convert packing methods from Packer* to Packable* objects
X-Git-Tag: merge-candidate-3-v1~101^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ab88366648f6229e324288ac8464a5ac19c5c12;p=thirdparty%2Fsquid.git

Convert packing methods from Packer* to Packable* objects

Packaging code can now receive any object that implements the Packable
interface instead of requiring the Packer trampoline object. For now it
is still the only object implementing Packable.
---

7ab88366648f6229e324288ac8464a5ac19c5c12
diff --cc src/HttpMsg.h
index d85aa795b8,275b260591..065820dddb
--- a/src/HttpMsg.h
+++ b/src/HttpMsg.h
@@@ -89,9 -89,9 +89,9 @@@ protected
       * \retval true   Status line has no serious problems.
       * \retval false  Status line has a serious problem. Correct response is indicated by error.
       */
 -    virtual bool sanityCheckStartLine(MemBuf *buf, const size_t hdr_len, Http::StatusCode *error) = 0;
 +    virtual bool sanityCheckStartLine(const char *buf, const size_t hdr_len, Http::StatusCode *error) = 0;
  
-     virtual void packFirstLineInto(Packer * p, bool full_uri) const = 0;
+     virtual void packFirstLineInto(Packable * p, bool full_uri) const = 0;
  
      virtual bool parseFirstLine(const char *blk_start, const char *blk_end) = 0;
  
diff --cc src/HttpRequest.h
index 2c104b1bb0,ada6ed0560..526a16ef97
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@@ -255,9 -255,9 +255,9 @@@ private
      mutable int64_t rangeOffsetLimit;  /* caches the result of getRangeOffsetLimit */
  
  protected:
-     virtual void packFirstLineInto(Packer * p, bool full_uri) const;
+     virtual void packFirstLineInto(Packable * p, bool full_uri) const;
  
 -    virtual bool sanityCheckStartLine(MemBuf *buf, const size_t hdr_len, Http::StatusCode *error);
 +    virtual bool sanityCheckStartLine(const char *buf, const size_t hdr_len, Http::StatusCode *error);
  
      virtual void hdrCacheInit();
  
diff --cc src/tests/stub_HttpReply.cc
index 8ae8d38863,a91e28027a..b8dabc9135
--- a/src/tests/stub_HttpReply.cc
+++ b/src/tests/stub_HttpReply.cc
@@@ -18,10 -18,10 +18,10 @@@ HttpReply::HttpReply() : HttpMsg(hoRepl
      STUB_NOP
      HttpReply::~HttpReply() STUB
      void HttpReply::setHeaders(Http::StatusCode status, const char *reason, const char *ctype, int64_t clen, time_t lmt, time_t expires_) STUB
-     void HttpReply::packHeadersInto(Packer * p) const STUB
+     void HttpReply::packHeadersInto(Packable *) const STUB
      void HttpReply::reset() STUB
-     void httpBodyPackInto(const HttpBody * body, Packer * p) STUB
+     void httpBodyPackInto(const HttpBody *, Packable *) STUB
 -    bool HttpReply::sanityCheckStartLine(MemBuf *buf, const size_t hdr_len, Http::StatusCode *error) STUB_RETVAL(false)
 +    bool HttpReply::sanityCheckStartLine(const char *buf, const size_t hdr_len, Http::StatusCode *error) STUB_RETVAL(false)
      int HttpReply::httpMsgParseError() STUB_RETVAL(0)
      bool HttpReply::expectingBody(const HttpRequestMethod&, int64_t&) const STUB_RETVAL(false)
      bool HttpReply::parseFirstLine(const char *start, const char *end) STUB_RETVAL(false)
diff --cc src/tests/stub_HttpRequest.cc
index 62ff173da5,9c45144062..765769aadd
--- a/src/tests/stub_HttpRequest.cc
+++ b/src/tests/stub_HttpRequest.cc
@@@ -16,8 -16,8 +16,8 @@@
  HttpRequest::HttpRequest() : HttpMsg(hoRequest) STUB
      HttpRequest::HttpRequest(const HttpRequestMethod& aMethod, AnyP::ProtocolType aProtocol, const char *aUrlpath) : HttpMsg(hoRequest) STUB
      HttpRequest::~HttpRequest() STUB
-     void HttpRequest::packFirstLineInto(Packer * p, bool full_uri) const STUB
+     void HttpRequest::packFirstLineInto(Packable *, bool) const STUB
 -    bool HttpRequest::sanityCheckStartLine(MemBuf *buf, const size_t hdr_len, Http::StatusCode *error) STUB_RETVAL(false)
 +    bool HttpRequest::sanityCheckStartLine(const char*buf, const size_t hdr_len, Http::StatusCode *error) STUB_RETVAL(false)
      void HttpRequest::hdrCacheInit() STUB
      void HttpRequest::reset() STUB
      bool HttpRequest::expectingBody(const HttpRequestMethod& unused, int64_t&) const STUB_RETVAL(false)