------------------------------------------------------------ revno: 11965 revision-id: squidadm@squid-cache.org-20120108013532-xrrstnw347s679en parent: squid3@treenet.co.nz-20120107101540-r30l1lo0lglmndhs committer: Automatic source maintenance branch nick: trunk timestamp: Sat 2012-01-07 18:35:32 -0700 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20120108013532-\ # xrrstnw347s679en # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 49f75ff48dfe2f5a46b9823a993dec8e954fbb2e # timestamp: 2012-01-08 01:59:15 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20120107101540-\ # r30l1lo0lglmndhs # # Begin patch === modified file 'src/tests/stub_HttpRequest.cc' --- src/tests/stub_HttpRequest.cc 2012-01-07 10:15:40 +0000 +++ src/tests/stub_HttpRequest.cc 2012-01-08 01:35:32 +0000 @@ -5,15 +5,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_cache_manager.cc' --- src/tests/stub_cache_manager.cc 2012-01-07 10:15:40 +0000 +++ src/tests/stub_cache_manager.cc 2012-01-08 01:35:32 +0000 @@ -6,9 +6,10 @@ #include "tests/STUB.h" Mgr::Action::Pointer CacheManager::createNamedAction(char const* action) STUB_RETVAL(NULL) -void CacheManager::Start(const Comm::ConnectionPointer &conn, HttpRequest * request, StoreEntry * entry) { -std::cerr << HERE << "\n"; -STUB +void CacheManager::Start(const Comm::ConnectionPointer &conn, HttpRequest * request, StoreEntry * entry) +{ + std::cerr << HERE << "\n"; + STUB } CacheManager* CacheManager::instance=0; CacheManager* CacheManager::GetInstance() STUB_RETVAL(instance) === modified file 'src/tests/stub_mem_node.cc' --- src/tests/stub_mem_node.cc 2012-01-07 10:15:40 +0000 +++ src/tests/stub_mem_node.cc 2012-01-08 01:35:32 +0000 @@ -5,4 +5,4 @@ #include "tests/STUB.h" mem_node::mem_node(int64_t offset):nodeBuffer(0,offset,data) STUB -size_t mem_node::InUseCount() STUB_RETVAL(0) + size_t mem_node::InUseCount() STUB_RETVAL(0)