------------------------------------------------------------
revno: 12267
revision-id: squidadm@squid-cache.org-20120810001223-c9hlzv6sxbk2q2v6
parent: kinkie@squid-cache.org-20120809150102-md1i26aah9d3xfn5
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Thu 2012-08-09 18:12:23 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20120810001223-\
#   c9hlzv6sxbk2q2v6
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 03a626ae8e2445a6fcc482612222ccf537727252
# timestamp: 2012-08-10 00:52:48 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20120809150102-\
#   md1i26aah9d3xfn5
# 
# Begin patch
=== modified file 'src/tests/stub_HttpRequest.cc'
--- src/tests/stub_HttpRequest.cc	2012-08-08 07:54:29 +0000
+++ src/tests/stub_HttpRequest.cc	2012-08-10 00:12:23 +0000
@@ -6,15 +6,15 @@
 #include "tests/STUB.h"
 
 HttpRequest::HttpRequest() : HttpMsg(hoRequest) STUB
-HttpRequest::HttpRequest(const HttpRequestMethod& method, AnyP::ProtocolType protocol, const char *aUrlpath) : HttpMsg(hoRequest) STUB
-HttpRequest::~HttpRequest() STUB
-void HttpRequest::packFirstLineInto(Packer * p, bool full_uri) const STUB
-bool HttpRequest::sanityCheckStartLine(MemBuf *buf, const size_t hdr_len, http_status *error) STUB_RETVAL(false)
-void HttpRequest::hdrCacheInit() STUB
-void HttpRequest::reset() STUB
-bool HttpRequest::expectingBody(const HttpRequestMethod& unused, int64_t&) const STUB_RETVAL(false)
-void HttpRequest::initHTTP(const HttpRequestMethod& aMethod, AnyP::ProtocolType aProtocol, const char *aUrlpath) STUB
-bool HttpRequest::parseFirstLine(const char *start, const char *end) STUB_RETVAL(false)
-HttpRequest * HttpRequest::clone() const STUB_RETVAL(NULL)
-bool HttpRequest::inheritProperties(const HttpMsg *aMsg) STUB_RETVAL(false)
-int64_t HttpRequest::getRangeOffsetLimit() STUB_RETVAL(0)
+        HttpRequest::HttpRequest(const HttpRequestMethod& method, AnyP::ProtocolType protocol, const char *aUrlpath) : HttpMsg(hoRequest) STUB
+        HttpRequest::~HttpRequest() STUB
+        void HttpRequest::packFirstLineInto(Packer * p, bool full_uri) const STUB
+        bool HttpRequest::sanityCheckStartLine(MemBuf *buf, const size_t hdr_len, http_status *error) STUB_RETVAL(false)
+        void HttpRequest::hdrCacheInit() STUB
+        void HttpRequest::reset() STUB
+        bool HttpRequest::expectingBody(const HttpRequestMethod& unused, int64_t&) const STUB_RETVAL(false)
+        void HttpRequest::initHTTP(const HttpRequestMethod& aMethod, AnyP::ProtocolType aProtocol, const char *aUrlpath) STUB
+        bool HttpRequest::parseFirstLine(const char *start, const char *end) STUB_RETVAL(false)
+        HttpRequest * HttpRequest::clone() const STUB_RETVAL(NULL)
+        bool HttpRequest::inheritProperties(const HttpMsg *aMsg) STUB_RETVAL(false)
+        int64_t HttpRequest::getRangeOffsetLimit() STUB_RETVAL(0)

=== modified file 'src/tests/stub_libcomm.cc'
--- src/tests/stub_libcomm.cc	2012-08-08 07:54:29 +0000
+++ src/tests/stub_libcomm.cc	2012-08-10 00:12:23 +0000
@@ -26,19 +26,19 @@
 void Comm::ConnOpener::start() STUB
 void Comm::ConnOpener::swanSong() STUB
 Comm::ConnOpener::ConnOpener(Comm::ConnectionPointer &, AsyncCall::Pointer &, time_t) : AsyncJob("STUB Comm::ConnOpener") STUB
-Comm::ConnOpener::~ConnOpener() STUB
-void Comm::ConnOpener::setHost(const char *) STUB
-const char * Comm::ConnOpener::getHost() const STUB_RETVAL(NULL)
+        Comm::ConnOpener::~ConnOpener() STUB
+        void Comm::ConnOpener::setHost(const char *) STUB
+        const char * Comm::ConnOpener::getHost() const STUB_RETVAL(NULL)
 
 #include "comm/forward.h"
-bool Comm::IsConnOpen(const Comm::ConnectionPointer &) STUB_RETVAL(false)
+        bool Comm::IsConnOpen(const Comm::ConnectionPointer &) STUB_RETVAL(false)
 
 #include "comm/IoCallback.h"
-void Comm::IoCallback::setCallback(iocb_type type, AsyncCall::Pointer &cb, char *buf, FREE *func, int sz) STUB
-void Comm::IoCallback::selectOrQueueWrite() STUB
-void Comm::IoCallback::cancel(const char *reason) STUB
-void Comm::IoCallback::finish(comm_err_t code, int xerrn) STUB
-Comm::CbEntry *Comm::iocb_table = NULL;
+        void Comm::IoCallback::setCallback(iocb_type type, AsyncCall::Pointer &cb, char *buf, FREE *func, int sz) STUB
+        void Comm::IoCallback::selectOrQueueWrite() STUB
+        void Comm::IoCallback::cancel(const char *reason) STUB
+        void Comm::IoCallback::finish(comm_err_t code, int xerrn) STUB
+        Comm::CbEntry *Comm::iocb_table = NULL;
 void Comm::CallbackTableInit() STUB
 void Comm::CallbackTableDestruct() STUB