From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 29 Sep 2008 05:46:28 +0000 (-0600)
Subject: Synced with minor libecap API changes
X-Git-Tag: SQUID_3_1_0_1~45^2~11^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a96661a8dfaf228a8abe924ff1a7f7968ef18768;p=thirdparty%2Fsquid.git

Synced with minor libecap API changes
---

diff --git a/src/eCAP/Config.cc b/src/eCAP/Config.cc
index 4ba2e7611a..73057d8e66 100644
--- a/src/eCAP/Config.cc
+++ b/src/eCAP/Config.cc
@@ -23,8 +23,8 @@ Ecap::Config::~Config()
 void
 Ecap::Config::finalize() {
 	Adaptation::Config::finalize();
-	static Ecap::Host *TheHost = new Ecap::Host;
-	libecap::RegisterHost(TheHost);
+	libecap::shared_ptr<Ecap::Host> host(new Ecap::Host);
+	libecap::RegisterHost(host);
 }
 
 Adaptation::ServicePointer
diff --git a/src/eCAP/XactionRep.cc b/src/eCAP/XactionRep.cc
index 4c07de8bfa..12f15f43c2 100644
--- a/src/eCAP/XactionRep.cc
+++ b/src/eCAP/XactionRep.cc
@@ -196,11 +196,11 @@ Ecap::XactionRep::useAdapted(const libecap::shared_ptr<libecap::Message> &m)
 }
 
 void
-Ecap::XactionRep::vbIgnore()
+Ecap::XactionRep::vbDiscard()
 {
     Must(proxyingVb == opUndecided);
     // if adapter does not need vb, we do not need to send it
-    dropVirgin("vbIgnore");
+    dropVirgin("vbDiscard");
     Must(proxyingVb == opNever);
 }
 
@@ -232,7 +232,7 @@ Ecap::XactionRep::vbMakeMore()
 }
 
 libecap::Area
-Ecap::XactionRep::vbContent(libecap::off_type o, libecap::size_type s)
+Ecap::XactionRep::vbContent(libecap::size_type o, libecap::size_type s)
 {
     Must(canAccessVb);
     // We may not be proxyingVb yet. It should be OK, but see vbContentShift().
diff --git a/src/eCAP/XactionRep.h b/src/eCAP/XactionRep.h
index f9fe27c05b..2386d4064c 100644
--- a/src/eCAP/XactionRep.h
+++ b/src/eCAP/XactionRep.h
@@ -39,11 +39,11 @@ public:
     virtual void useAdapted(const libecap::shared_ptr<libecap::Message> &msg);
     virtual void adaptationDelayed(const libecap::Delay &);
     virtual void adaptationAborted();
-    virtual void vbIgnore();
+    virtual void vbDiscard();
     virtual void vbMake();
     virtual void vbStopMaking();
     virtual void vbMakeMore();
-    virtual libecap::Area vbContent(libecap::off_type offset, libecap::size_type size);
+    virtual libecap::Area vbContent(libecap::size_type offset, libecap::size_type size);
     virtual void vbContentShift(libecap::size_type size);
     virtual void noteAbContentDone(bool atEnd);
     virtual void noteAbContentAvailable();