From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 19 Jun 2013 04:59:56 +0000 (-0600)
Subject: Cleanup: update several CBDATA classes
X-Git-Tag: SQUID_3_4_0_1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bda078fe589dc2ebd97ce9fd6d91006c77fac5a1;p=thirdparty%2Fsquid.git

Cleanup: update several CBDATA classes

Removes several cbdataAlloc/cbdataFree by updating classes to use
CBDATA_CLASS2 macro..
---

diff --git a/src/ftp.cc b/src/ftp.cc
index bcd173a15b..fb320b0664 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -182,12 +182,7 @@ private:
 /// \ingroup ServerProtocolFTPInternal
 class FtpStateData : public ServerStateData
 {
-
 public:
-    void *operator new (size_t);
-    void operator delete (void *);
-    void *toCbdata() { return this; }
-
     FtpStateData(FwdState *, const Comm::ConnectionPointer &conn);
     ~FtpStateData();
     char user[MAX_URL];
@@ -238,9 +233,6 @@ public:
 
     struct _ftp_flags flags;
 
-private:
-    CBDATA_CLASS(FtpStateData);
-
 public:
     // these should all be private
     virtual void start();
@@ -309,25 +301,12 @@ public:
 private:
     // BodyConsumer for HTTP: consume request body.
     virtual void handleRequestBodyProducerAborted();
+
+    CBDATA_CLASS2(FtpStateData);
 };
 
 CBDATA_CLASS_INIT(FtpStateData);
 
-void *
-FtpStateData::operator new (size_t)
-{
-    CBDATA_INIT_TYPE(FtpStateData);
-    FtpStateData *result = cbdataAlloc(FtpStateData);
-    return result;
-}
-
-void
-FtpStateData::operator delete (void *address)
-{
-    FtpStateData *t = static_cast<FtpStateData *>(address);
-    cbdataFree(t);
-}
-
 /// \ingroup ServerProtocolFTPInternal
 typedef struct {
     char type;
diff --git a/src/urn.cc b/src/urn.cc
index 2d7c964312..59e61d4a52 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -31,6 +31,7 @@
  */
 
 #include "squid.h"
+#include "cbdata.h"
 #include "errorpage.h"
 #include "FwdState.h"
 #include "globals.h"
@@ -54,8 +55,6 @@ class UrnState : public StoreClient
 
 public:
     void created (StoreEntry *newEntry);
-    void *operator new (size_t byteCount);
-    void operator delete (void *address);
     void start (HttpRequest *, StoreEntry *);
     char *getHost (String &urlpath);
     void setUriResFromRequest(HttpRequest *);
@@ -79,6 +78,8 @@ public:
 
 private:
     char *urlres;
+
+    CBDATA_CLASS2(UrnState);
 };
 
 typedef struct {
@@ -96,25 +97,9 @@ static url_entry *urnParseReply(const char *inbuf, const HttpRequestMethod&);
 static const char *const crlf = "\r\n";
 static QS url_entry_sort;
 
-CBDATA_TYPE(UrnState);
-void *
-UrnState::operator new (size_t byteCount)
-{
-    /* derived classes with different sizes must implement their own new */
-    assert (byteCount == sizeof (UrnState));
-    CBDATA_INIT_TYPE(UrnState);
-    return cbdataAlloc(UrnState);
-
-}
-
-void
-UrnState::operator delete (void *address)
-{
-    UrnState * tmp = (UrnState *)address;
-    cbdataFree (tmp);
-}
+CBDATA_CLASS_INIT(UrnState);
 
-UrnState::~UrnState ()
+UrnState::~UrnState()
 {
     safe_free(urlres);
 }