Cleanup: remove unused members and functions in stateful helper

diff --git a/src/helper.cc b/src/helper.cc
index 02f4f53b488b1ad3e1e97f6fc1567a914dd063c5..aed4981c49eeb063b53c821a3da6a9fa6f26a6f9 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -335,9 +335,6 @@ helperStatefulOpenServers(statefulhelper * hlp)
         srv->roffset = 0;
         srv->parent = cbdataReference(hlp);
 
-        if (hlp->datapool != NULL)
-            srv->data = hlp->datapool->alloc();
-
         dlinkAddTail(srv, &srv->link, &hlp->servers);
 
         if (rfd == wfd) {
@@ -552,13 +549,6 @@ helperStatefulReleaseServer(helper_stateful_server * srv)
     helperStatefulServerDone(srv);
 }
 
-/** return a pointer to the stateful routines data area */
-void *
-helperStatefulServerGetData(helper_stateful_server * srv)
-{
-    return srv->data;
-}
-
 void
 helper::packStatsInto(Packable *p, const char *label) const
 {
@@ -849,9 +839,6 @@ helperStatefulServerFree(helper_stateful_server *srv)
         delete r;
     }
 
-    if (srv->data != NULL)
-        hlp->datapool->freeOne(srv->data);
-
     cbdataReferenceDone(srv->parent);
 
     delete srv;

diff --git a/src/helper.h b/src/helper.h
index 62128b699358dbfa2daa5daf29f67a9ba47708aa..2602db8cf9cde21c594a1ffeb9eab18f334cac94 100644 (file)
--- a/src/helper.h
+++ b/src/helper.h
@@ -134,12 +134,9 @@ class statefulhelper : public helper
     CBDATA_CLASS(statefulhelper);
 
 public:
-    inline statefulhelper(const char *name) : helper(name), datapool(NULL) {}
+    inline statefulhelper(const char *name) : helper(name) {}
     inline ~statefulhelper() {}
 
-public:
-    MemAllocator *datapool;
-
 private:
     friend void helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPCB * callback, void *data, helper_stateful_server * lastserver);
     void submit(const char *buf, HLPCB * callback, void *data, helper_stateful_server *lastserver);
@@ -253,12 +250,7 @@ class helper_stateful_server : public HelperServerBase
     CBDATA_CLASS(helper_stateful_server);
 
 public:
-    /* MemBuf wqueue; */
-    /* MemBuf writebuf; */
-
     statefulhelper *parent;
-
-    void *data;         /* State data used by the calling routines */
 };
 
 /* helper.c */
@@ -269,7 +261,6 @@ void helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPCB * callbac
 void helperShutdown(helper * hlp);
 void helperStatefulShutdown(statefulhelper * hlp);
 void helperStatefulReleaseServer(helper_stateful_server * srv);
-void *helperStatefulServerGetData(helper_stateful_server * srv);
 
 #endif /* SQUID_HELPER_H */
 

diff --git a/src/tests/stub_helper.cc b/src/tests/stub_helper.cc
index bd0d8c19fe333f42d624f7028460288d21444e40..c8f89e8562afcf8300158a94064c5d3fb66a4b9e 100644 (file)
--- a/src/tests/stub_helper.cc
+++ b/src/tests/stub_helper.cc
@@ -22,7 +22,6 @@ void helperShutdown(helper * hlp) STUB
 void helperStatefulShutdown(statefulhelper * hlp) STUB
 void helperOpenServers(helper * hlp) STUB
 void helperStatefulOpenServers(statefulhelper * hlp) STUB
-void *helperStatefulServerGetData(helper_stateful_server * srv) STUB_RETVAL(NULL)
 helper_stateful_server *helperStatefulDefer(statefulhelper * hlp) STUB_RETVAL(NULL)
 void helperStatefulReleaseServer(helper_stateful_server * srv) STUB
 CBDATA_CLASS_INIT(statefulhelper);