Remove unused/broken ACL copying support (#941)

This code is unused. The clone() methods were the only use of
copy construction and operator. Most ACL related classes lack
implementation of the copy and/or assert so even if used this
code would be quite dangerous.

Explicitly forbid copy/move at the hierarchy base classes
ACL and ACLData. Removing all child specific copy
implementations and prohibitions (now unnecessary).

diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index a1a4a34dd26ca2de88a8f69e2dc91c885c557620..b0a5b81a95b8a66cec3fb6cc9900faa9ed16acef 100644 (file)
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -42,11 +42,8 @@ public:
     static void ExternalAclLookup(ACLChecklist * ch, ACLExternal *);
 
     ACLExternal(char const *);
-    ACLExternal(ACLExternal const &);
     ~ACLExternal();
-    ACLExternal&operator=(ACLExternal const &);
 
-    virtual ACL *clone()const;
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);

diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index cb79364e8fdbca42b69b82b7263ee30309d25604..e7934ab449e1a71866daff6c9620310baa82cc30 100644 (file)
--- a/src/acl/Acl.h
+++ b/src/acl/Acl.h
@@ -48,6 +48,7 @@ public:
     static ACL *FindByName(const char *name);
 
     ACL();
+    ACL(ACL &&) = delete; // no copying of any kind
     virtual ~ACL();
 
     /// sets user-specified ACL name and squid.conf context

diff --git a/src/acl/AdaptationServiceData.cc b/src/acl/AdaptationServiceData.cc
index 7b2f0cb3a6a88ed3a1e7d9eff84bf78a91cfb36d..e04f7fe002e65029cc6678686a70e5d4164a7b4b 100644 (file)
--- a/src/acl/AdaptationServiceData.cc
+++ b/src/acl/AdaptationServiceData.cc
@@ -38,9 +38,3 @@ ACLAdaptationServiceData::parse()
     }
 }
 
-ACLData<char const *> *
-ACLAdaptationServiceData::clone() const
-{
-    return new ACLAdaptationServiceData(*this);
-}
-

diff --git a/src/acl/AdaptationServiceData.h b/src/acl/AdaptationServiceData.h
index ee6dbed42e3f997f5502a6a14f5f38d7328833d1..59ab0828fd239eaa58360b017f701799e82ff100 100644 (file)
--- a/src/acl/AdaptationServiceData.h
+++ b/src/acl/AdaptationServiceData.h
@@ -18,11 +18,7 @@ class ACLAdaptationServiceData : public ACLStringData
 {
 public:
     ACLAdaptationServiceData() : ACLStringData() {}
-    ACLAdaptationServiceData(ACLAdaptationServiceData const &old) : ACLStringData(old) {};
-    // Not implemented
-    ACLAdaptationServiceData &operator= (ACLAdaptationServiceData const &);
     virtual void parse();
-    virtual ACLData<char const *> *clone() const;
 };
 
 #endif /* SQUID_ADAPTATIONSERVICEDATA_H */

diff --git a/src/acl/AllOf.cc b/src/acl/AllOf.cc
index 5d7786b75f1ca9a84021aa5895d308dbcf830c9f..65f5afc1c2e4e0f77d7b6ed090cae2d6c36e5977 100644 (file)
--- a/src/acl/AllOf.cc
+++ b/src/acl/AllOf.cc
@@ -20,12 +20,6 @@ Acl::AllOf::typeString() const
     return "all-of";
 }
 
-ACL *
-Acl::AllOf::clone() const
-{
-    return new AllOf;
-}
-
 SBufList
 Acl::AllOf::dump() const
 {

diff --git a/src/acl/AllOf.h b/src/acl/AllOf.h
index 155c6f0419ca80db70bf5a09833b7ee0a2b8ecf6..98b8346f3d48904afe4a7fd7b81003bfccb3addb 100644 (file)
--- a/src/acl/AllOf.h
+++ b/src/acl/AllOf.h
@@ -24,7 +24,6 @@ class AllOf: public Acl::InnerNode
 public:
     /* ACL API */
     virtual char const *typeString() const;
-    virtual ACL *clone() const;
     virtual void parse();
     virtual SBufList dump() const;
 

diff --git a/src/acl/AnnotationData.cc b/src/acl/AnnotationData.cc
index c924ee1cd1d66b878949fd13a39a4c7af4f5422a..35f8894087fde1628ef3aa78b0dbc139ec653c26 100644 (file)
--- a/src/acl/AnnotationData.cc
+++ b/src/acl/AnnotationData.cc
@@ -45,9 +45,3 @@ ACLAnnotationData::annotate(NotePairs::Pointer pairs, const CharacterSet *delimi
     notes->updateNotePairs(pairs, delimiters, al);
 }
 
-ACLData<NotePairs::Entry *> *
-ACLAnnotationData::clone() const
-{
-    return new ACLAnnotationData;
-}
-

diff --git a/src/acl/AnnotationData.h b/src/acl/AnnotationData.h
index 3e99122d6ae49ab9f7d13d35da99b59836a5270a..2e8993b316977000ababb7c6dec0bd60c5e4c34b 100644 (file)
--- a/src/acl/AnnotationData.h
+++ b/src/acl/AnnotationData.h
@@ -26,7 +26,6 @@ public:
     virtual SBufList dump() const;
     virtual void parse();
     virtual bool empty() const { return notes->empty(); }
-    virtual ACLData<NotePairs::Entry *> *clone() const;
 
     /// Stores annotations into pairs.
     void annotate(NotePairs::Pointer pairs, const CharacterSet *delimiters, const AccessLogEntry::Pointer &al);

diff --git a/src/acl/AnyOf.cc b/src/acl/AnyOf.cc
index 8d9e7121a4cf02bce1aa58f2a7960a64dbc083ce..5a4fc0ad4f0c7c68c09ed4eaee30c906b7a7d7e9 100644 (file)
--- a/src/acl/AnyOf.cc
+++ b/src/acl/AnyOf.cc
@@ -15,12 +15,6 @@ Acl::AnyOf::typeString() const
     return "any-of";
 }
 
-ACL *
-Acl::AnyOf::clone() const
-{
-    return new AnyOf;
-}
-
 // called once per "acl name any-of name1 name2 ...." line
 // but since multiple lines are ORed, the line boundary does not matter,
 // so we flatten the tree into one line/level here to minimize overheads

diff --git a/src/acl/AnyOf.h b/src/acl/AnyOf.h
index 3051ec28780e4421f172f2035095aa9df483942b..68f553611fa8ec63b7adc39304bb998cdcccf257 100644 (file)
--- a/src/acl/AnyOf.h
+++ b/src/acl/AnyOf.h
@@ -22,7 +22,6 @@ class AnyOf: public Acl::OrNode
 public:
     /* ACL API */
     virtual char const *typeString() const;
-    virtual ACL *clone() const;
     virtual void parse();
 };
 

diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc
index 685427b0e90c48fa6e62368b3ca07aa0e218a5d0..35495d2ffc987d35b13e7a510af7f2911b9f7c5f 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -22,19 +22,9 @@
 
 #include <algorithm>
 
-ACL *
-ACLARP::clone() const
-{
-    return new ACLARP(*this);
-}
-
 ACLARP::ACLARP (char const *theClass) : class_ (theClass)
 {}
 
-ACLARP::ACLARP (ACLARP const & old) : class_ (old.class_), aclArpData(old.aclArpData)
-{
-}
-
 char const *
 ACLARP::typeString() const
 {

diff --git a/src/acl/Arp.h b/src/acl/Arp.h
index fd6691b025fb07f48b6a53849bba6073f1f470fd..798ee581c76648f1f814b8e7528bc28939a781c3 100644 (file)
--- a/src/acl/Arp.h
+++ b/src/acl/Arp.h
@@ -25,11 +25,8 @@ class ACLARP : public ACL
 
 public:
     ACLARP(char const *);
-    ACLARP(ACLARP const &);
     ~ACLARP() {}
-    ACLARP&operator=(ACLARP const &);
 
-    virtual ACL *clone()const;
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);

diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc
index 12853ae778160eb0b679a841e792fd82c13e77f1..a6b59cb01bbbd103e2262817821c7e70a867e9ea 100644 (file)
--- a/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@ -570,15 +570,6 @@ ACLASN::parse()
     }
 }
 
-ACLData<Ip::Address> *
-ACLASN::clone() const
-{
-    if (data)
-        fatal ("cloning of ACLASN not implemented");
-
-    return new ACLASN(*this);
-}
-
 /* explicit template instantiation required for some systems */
 
 template class ACLStrategised<Ip::Address>;

diff --git a/src/acl/Asn.h b/src/acl/Asn.h
index 83dd0d06c26b1528e546e8b866b8b3d3e4d4d12a..cb3d568f9c79cadb3e8d65430c2acd000cca1c0a 100644 (file)
--- a/src/acl/Asn.h
+++ b/src/acl/Asn.h
@@ -34,7 +34,6 @@ public:
     virtual SBufList dump() const;
     virtual void parse();
     bool empty() const;
-    virtual ACLData<Ip::Address> *clone() const;
     virtual void prepareForUse();
 
 private:

diff --git a/src/acl/AtStepData.cc b/src/acl/AtStepData.cc
index 5a55e3b34da6e1367570697af0d255766632ecf2..7fd62bca32072110382ad70812812be5351c90a4 100644 (file)
--- a/src/acl/AtStepData.cc
+++ b/src/acl/AtStepData.cc
@@ -50,11 +50,6 @@ StepValue(const char *name)
 ACLAtStepData::ACLAtStepData()
 {}
 
-ACLAtStepData::ACLAtStepData(ACLAtStepData const &old)
-{
-    values.assign(old.values.begin(), old.values.end());
-}
-
 ACLAtStepData::~ACLAtStepData()
 {
 }
@@ -92,9 +87,3 @@ ACLAtStepData::empty() const
     return values.empty();
 }
 
-ACLAtStepData *
-ACLAtStepData::clone() const
-{
-    return new ACLAtStepData(*this);
-}
-

diff --git a/src/acl/AtStepData.h b/src/acl/AtStepData.h
index a9f2736c6eb53952823a02d62cd941bb013d47dc..5e85d69b99123ff42db103c3b3e9828b508ba5f9 100644 (file)
--- a/src/acl/AtStepData.h
+++ b/src/acl/AtStepData.h
@@ -20,14 +20,11 @@ class ACLAtStepData : public ACLData<XactionStep>
 
 public:
     ACLAtStepData();
-    ACLAtStepData(ACLAtStepData const &);
-    ACLAtStepData &operator= (ACLAtStepData const &);
     virtual ~ACLAtStepData();
     bool match(XactionStep);
     virtual SBufList dump() const;
     void parse();
     bool empty() const;
-    virtual ACLAtStepData *clone() const;
 
     std::list<XactionStep> values;
 };

diff --git a/src/acl/BoolOps.cc b/src/acl/BoolOps.cc
index 757699f2f80c0bb1e56b33a7f17726a9f8bd9711..b155434994a99acb4aac5cb2edda7cf33c22cb49 100644 (file)
--- a/src/acl/BoolOps.cc
+++ b/src/acl/BoolOps.cc
@@ -52,16 +52,6 @@ Acl::NotNode::typeString() const
     return "!";
 }
 
-ACL *
-Acl::NotNode::clone() const
-{
-    // Not implemented: we are not a named ACL type in squid.conf so nobody
-    // should try to create a NotNode instance by ACL type name (which is
-    // what clone() API is for -- it does not really clone anything).
-    assert(false);
-    return NULL;
-}
-
 SBufList
 Acl::NotNode::dump() const
 {
@@ -78,12 +68,6 @@ Acl::AndNode::typeString() const
     return "and";
 }
 
-ACL *
-Acl::AndNode::clone() const
-{
-    return new AndNode;
-}
-
 int
 Acl::AndNode::doMatch(ACLChecklist *checklist, Nodes::const_iterator start) const
 {
@@ -112,12 +96,6 @@ Acl::OrNode::typeString() const
     return "any-of";
 }
 
-ACL *
-Acl::OrNode::clone() const
-{
-    return new OrNode;
-}
-
 bool
 Acl::OrNode::bannedAction(ACLChecklist *, Nodes::const_iterator) const
 {

diff --git a/src/acl/BoolOps.h b/src/acl/BoolOps.h
index e89db44262fd9d0885be056a6ba5fd9953984787..a307023107f5e301ab70b48baed5689573e46e2f 100644 (file)
--- a/src/acl/BoolOps.h
+++ b/src/acl/BoolOps.h
@@ -29,7 +29,6 @@ public:
 private:
     /* ACL API */
     virtual char const *typeString() const;
-    virtual ACL *clone() const;
     virtual void parse();
     virtual SBufList dump() const;
 
@@ -47,7 +46,6 @@ class AndNode: public InnerNode
 public:
     /* ACL API */
     virtual char const *typeString() const;
-    virtual ACL *clone() const;
     virtual void parse();
 
 private:
@@ -68,7 +66,6 @@ public:
 
     /* ACL API */
     virtual char const *typeString() const;
-    virtual ACL *clone() const;
     virtual void parse();
 
 protected:

diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc
index 12056d7d7784cf766c07cad8d3a3461cdfb8ac47..902df23635d556571d42f96e587babeee7e6d3ee 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -30,15 +30,6 @@ ACLCertificateData::ACLCertificateData(Ssl::GETX509ATTRIBUTE *sslStrategy, const
     }
 }
 
-ACLCertificateData::ACLCertificateData(ACLCertificateData const &old) : attribute (NULL), values (old.values), sslAttributeCall (old.sslAttributeCall)
-{
-    validAttributesStr = old.validAttributesStr;
-    validAttributes.assign (old.validAttributes.begin(), old.validAttributes.end());
-    attributeIsOptional = old.attributeIsOptional;
-    if (old.attribute)
-        attribute = xstrdup(old.attribute);
-}
-
 template<class T>
 inline void
 xRefFree(T &thing)
@@ -159,10 +150,3 @@ ACLCertificateData::empty() const
     return values.empty();
 }
 
-ACLData<X509 *> *
-ACLCertificateData::clone() const
-{
-    /* Splay trees don't clone yet. */
-    return new ACLCertificateData(*this);
-}
-

diff --git a/src/acl/CertificateData.h b/src/acl/CertificateData.h
index c025430f246eae220d827324a0a89e33faf6ad30..02d36196fa48ebf2cd6bb57264b01832f55422a4 100644 (file)
--- a/src/acl/CertificateData.h
+++ b/src/acl/CertificateData.h
@@ -23,14 +23,11 @@ class ACLCertificateData : public ACLData<X509 *>
 
 public:
     ACLCertificateData(Ssl::GETX509ATTRIBUTE *, const char *attributes, bool optionalAttr = false);
-    ACLCertificateData(ACLCertificateData const &);
-    ACLCertificateData &operator= (ACLCertificateData const &);
     virtual ~ACLCertificateData();
     bool match(X509 *);
     virtual SBufList dump() const;
     void parse();
     bool empty() const;
-    virtual ACLData<X509 *> *clone() const;
 
     /// A '|'-delimited list of valid ACL attributes.
     /// A "*" item means that any attribute is acceptable.

diff --git a/src/acl/ConnectionsEncrypted.cc b/src/acl/ConnectionsEncrypted.cc
index ccd6524b2ea05ac5fd674631194216c07c820de3..9b1b533ac56696dac58d2f059c8f12c930854e2e 100644 (file)
--- a/src/acl/ConnectionsEncrypted.cc
+++ b/src/acl/ConnectionsEncrypted.cc
@@ -16,18 +16,9 @@
 #include "HttpRequest.h"
 #include "SquidConfig.h"
 
-ACL *
-Acl::ConnectionsEncrypted::clone() const
-{
-    return new Acl::ConnectionsEncrypted(*this);
-}
-
 Acl::ConnectionsEncrypted::ConnectionsEncrypted (char const *theClass) : class_ (theClass)
 {}
 
-Acl::ConnectionsEncrypted::ConnectionsEncrypted (Acl::ConnectionsEncrypted const & old) :class_ (old.class_)
-{}
-
 Acl::ConnectionsEncrypted::~ConnectionsEncrypted()
 {}
 

diff --git a/src/acl/ConnectionsEncrypted.h b/src/acl/ConnectionsEncrypted.h
index a3f1019de608de6ce6f8d35417f29448b82964d0..9f3f9505d17d2f9df56f7fe1252997b560030599 100644 (file)
--- a/src/acl/ConnectionsEncrypted.h
+++ b/src/acl/ConnectionsEncrypted.h
@@ -21,11 +21,8 @@ class ConnectionsEncrypted : public ACL
 
 public:
     ConnectionsEncrypted(char const *);
-    ConnectionsEncrypted(ConnectionsEncrypted const &);
     virtual ~ConnectionsEncrypted();
-    ConnectionsEncrypted &operator =(ConnectionsEncrypted const &);
 
-    virtual ACL *clone()const;
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);

diff --git a/src/acl/Data.h b/src/acl/Data.h
index 30582952bb7d81159c05796ab692e746234aba81..5037bb9618fec3f4b805f6cd083157833f676ffe 100644 (file)
--- a/src/acl/Data.h
+++ b/src/acl/Data.h
@@ -18,7 +18,8 @@ class ACLData
 {
 
 public:
-
+    ACLData() = default;
+    ACLData(ACLData<M> &&) = delete; // no copying of any kind
     virtual ~ACLData() {}
 
     /// \returns the flags supported by these ACL parameters (e.g., "-i")
@@ -27,7 +28,6 @@ public:
     virtual bool match(M) =0;
     virtual SBufList dump() const =0;
     virtual void parse() =0;
-    virtual ACLData *clone() const =0;
     virtual void prepareForUse() {}
 
     virtual bool empty() const =0;

diff --git a/src/acl/DestinationIp.cc b/src/acl/DestinationIp.cc
index 9db91d6a475c3d90eb851acdb4c7e3d56b9a2a7f..f0ef36e59e9ce8583ddc0bcea0761aa2d3346242 100644 (file)
--- a/src/acl/DestinationIp.cc
+++ b/src/acl/DestinationIp.cc
@@ -108,9 +108,3 @@ DestinationIPLookup::LookupDone(const ipcache_addrs *, const Dns::LookupDetails
     checklist->resumeNonBlockingCheck(DestinationIPLookup::Instance());
 }
 
-ACL *
-ACLDestinationIP::clone() const
-{
-    return new ACLDestinationIP(*this);
-}
-

diff --git a/src/acl/DestinationIp.h b/src/acl/DestinationIp.h
index d696a1b72a0dc628f6513808b94522f014716cb2..fe7ea71bb00a1f4ac3f9f3cb9a149d9497fe2c02 100644 (file)
--- a/src/acl/DestinationIp.h
+++ b/src/acl/DestinationIp.h
@@ -34,8 +34,6 @@ public:
     virtual const Acl::Options &options();
     virtual int match(ACLChecklist *checklist);
 
-    virtual ACL *clone()const;
-
 private:
     Acl::BooleanOptionValue lookupBanned; ///< are DNS lookups allowed?
 };

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index a4c1732bd08945b546d554bde8adb15add99e0bf..abf8c15aa52010e1dd68e60dbf3c25106da5b58f 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -150,11 +150,3 @@ ACLDomainData::empty() const
     return domains->empty();
 }
 
-ACLData<char const *> *
-ACLDomainData::clone() const
-{
-    /* Splay trees don't clone yet. */
-    assert (!domains);
-    return new ACLDomainData;
-}
-

diff --git a/src/acl/DomainData.h b/src/acl/DomainData.h
index af43c242a774edaa5a571204fce9c6f6bd9f4e5c..0f9091c9be16ca03cb2694e5e451f4a497fb1ecd 100644 (file)
--- a/src/acl/DomainData.h
+++ b/src/acl/DomainData.h
@@ -24,7 +24,6 @@ public:
     virtual SBufList dump() const;
     void parse();
     bool empty() const;
-    virtual ACLData<char const *> *clone() const;
 
     Splay<char *> *domains;
 };

diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc
index 1dad63b0083a4ff1f32b95c07808eb85de883f06..91a97283ebd6b2db4384b18b906553d94e0ebb02 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -20,19 +20,9 @@
 #include "globals.h"
 #include "ip/Address.h"
 
-ACL *
-ACLEui64::clone() const
-{
-    return new ACLEui64(*this);
-}
-
 ACLEui64::ACLEui64 (char const *theClass) : class_ (theClass)
 {}
 
-ACLEui64::ACLEui64 (ACLEui64 const & old) : eui64Data(old.eui64Data), class_ (old.class_)
-{
-}
-
 char const *
 ACLEui64::typeString() const
 {

diff --git a/src/acl/Eui64.h b/src/acl/Eui64.h
index c4a67b577d3d9f73bb4be0601221c7321d11a1de..42152e61666d564c6ca6f92070cb335dd59690d1 100644 (file)
--- a/src/acl/Eui64.h
+++ b/src/acl/Eui64.h
@@ -24,11 +24,8 @@ class ACLEui64 : public ACL
 
 public:
     ACLEui64(char const *);
-    ACLEui64(ACLEui64 const &);
     ~ACLEui64() {}
-    ACLEui64&operator=(ACLEui64 const &);
 
-    virtual ACL *clone()const;
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);

diff --git a/src/acl/ExtUser.cc b/src/acl/ExtUser.cc
index a7786654d375b3f1883ce77b259b8d69de609ffc..2e6ec30163d936e7517a693e075a70a9c3331504 100644 (file)
--- a/src/acl/ExtUser.cc
+++ b/src/acl/ExtUser.cc
@@ -26,17 +26,6 @@ ACLExtUser::~ACLExtUser()
 
 ACLExtUser::ACLExtUser(ACLData<char const *> *newData, char const *newType) : data (newData), type_ (newType) {}
 
-ACLExtUser::ACLExtUser (ACLExtUser const &old) : data (old.data->clone()), type_ (old.type_)
-{}
-
-ACLExtUser &
-ACLExtUser::operator= (ACLExtUser const &rhs)
-{
-    data = rhs.data->clone();
-    type_ = rhs.type_;
-    return *this;
-}
-
 char const *
 ACLExtUser::typeString() const
 {
@@ -78,11 +67,5 @@ ACLExtUser::empty () const
     return data->empty();
 }
 
-ACL *
-ACLExtUser::clone() const
-{
-    return new ACLExtUser(*this);
-}
-
 #endif /* USE_AUTH */
 

diff --git a/src/acl/ExtUser.h b/src/acl/ExtUser.h
index 96660d57bf53d9e1fa8acddf7ccdd1f7e022d679..07e4dbbc1306c892f106c703a45636dad3440634 100644 (file)
--- a/src/acl/ExtUser.h
+++ b/src/acl/ExtUser.h
@@ -21,8 +21,6 @@ class ACLExtUser : public ACL
 
 public:
     ACLExtUser(ACLData<char const *> *newData, char const *);
-    ACLExtUser (ACLExtUser const &old);
-    ACLExtUser & operator= (ACLExtUser const &rhs);
     ~ACLExtUser();
 
     /* ACL API */
@@ -32,7 +30,6 @@ public:
     virtual int match(ACLChecklist *checklist);
     virtual SBufList dump() const;
     virtual bool empty () const;
-    virtual ACL *clone()const;
 
 private:
     ACLData<char const *> *data;

diff --git a/src/acl/HasComponentData.cc b/src/acl/HasComponentData.cc
index 1197edfb9dc21b376b67e12c2fa876f8df5dbc65..81d0c2c46ec54a336a3b44a69eeac47a65728c10 100644 (file)
--- a/src/acl/HasComponentData.cc
+++ b/src/acl/HasComponentData.cc
@@ -76,9 +76,3 @@ ACLHasComponentData::parseComponent(const char *token)
     }
 }
 
-ACLData<ACLChecklist *> *
-ACLHasComponentData::clone() const
-{
-    return new ACLHasComponentData(*this);
-}
-

diff --git a/src/acl/HasComponentData.h b/src/acl/HasComponentData.h
index 0a3ad06a492beea6b12c4e944ad09b57ea717526..0e5ff752ae95c90f4505b2889530cf017bdb40ac 100644 (file)
--- a/src/acl/HasComponentData.h
+++ b/src/acl/HasComponentData.h
@@ -25,7 +25,6 @@ public:
     virtual SBufList dump() const override;
     virtual void parse() override;
     virtual bool empty() const override { return false; }
-    virtual ACLData<ACLChecklist *> *clone() const override;
 
 private:
     enum ComponentKind { coRequest = 0, coResponse, coAle, coEnd };

diff --git a/src/acl/HierCodeData.cc b/src/acl/HierCodeData.cc
index 603a4fec062959edf0dc8e5db31db12b5d6983b2..de800ea07bee13ca5d1363f0ca24d294b2dfa6df 100644 (file)
--- a/src/acl/HierCodeData.cc
+++ b/src/acl/HierCodeData.cc
@@ -19,11 +19,6 @@ ACLHierCodeData::ACLHierCodeData()
     memset(values, 0, sizeof(values));
 }
 
-ACLHierCodeData::ACLHierCodeData(ACLHierCodeData const &old)
-{
-    memcpy(values, old.values, sizeof(values) );
-}
-
 ACLHierCodeData::~ACLHierCodeData()
 { }
 
@@ -74,9 +69,3 @@ ACLHierCodeData::empty() const
     return true;
 }
 
-ACLData<hier_code> *
-ACLHierCodeData::clone() const
-{
-    return new ACLHierCodeData(*this);
-}
-

diff --git a/src/acl/HierCodeData.h b/src/acl/HierCodeData.h
index 10da63ec509831fbb97d543ea1ab20d9a9aa68ed..f20259572c6ee24bb569cdce11ce724f003664e6 100644 (file)
--- a/src/acl/HierCodeData.h
+++ b/src/acl/HierCodeData.h
@@ -19,14 +19,11 @@ class ACLHierCodeData : public ACLData<hier_code>
 
 public:
     ACLHierCodeData();
-    ACLHierCodeData(ACLHierCodeData const &);
-    ACLHierCodeData &operator= (ACLHierCodeData const &);
     virtual ~ACLHierCodeData();
     bool match(hier_code);
     virtual SBufList dump() const;
     void parse();
     bool empty() const;
-    virtual ACLData<hier_code> *clone() const;
 
     /// mask of codes this ACL might match.
     bool values[HIER_MAX];

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index aa986e9f332bbca17b6e21a8795d58b71a0377b2..c78366b7f0b26b4b88c47ca99984d34db80c396f 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -94,14 +94,3 @@ ACLHTTPHeaderData::empty() const
     return (hdrId == Http::HdrType::BAD_HDR && hdrName.isEmpty()) || regex_rule->empty();
 }
 
-ACLData<HttpHeader*> *
-ACLHTTPHeaderData::clone() const
-{
-    /* Header's don't clone yet. */
-    ACLHTTPHeaderData * result = new ACLHTTPHeaderData;
-    result->regex_rule = regex_rule->clone();
-    result->hdrId = hdrId;
-    result->hdrName = hdrName;
-    return result;
-}
-

diff --git a/src/acl/HttpHeaderData.h b/src/acl/HttpHeaderData.h
index d30dbae878838d2bffba254064c05493ff6ebc04..e94cf31cc459bf4b1e4ef9f33a5e32fb77564bb1 100644 (file)
--- a/src/acl/HttpHeaderData.h
+++ b/src/acl/HttpHeaderData.h
@@ -25,7 +25,6 @@ public:
     virtual SBufList dump() const;
     virtual void parse();
     virtual bool empty() const;
-    virtual ACLData<HttpHeader*> *clone() const;
 
 private:
     Http::HdrType hdrId;            /**< set if header is known */

diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc
index 118f0c2e5d873b6a971fd84edb47cf404f5e1db4..e3563d46800c962912387b7907a3a41c1b778f93 100644 (file)
--- a/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@ -56,21 +56,9 @@ int acl_httpstatus_data::compare(acl_httpstatus_data* const& a, acl_httpstatus_d
     return ret;
 }
 
-ACL *
-ACLHTTPStatus::clone() const
-{
-    return new ACLHTTPStatus(*this);
-}
-
 ACLHTTPStatus::ACLHTTPStatus (char const *theClass) : data(NULL), class_ (theClass)
 {}
 
-ACLHTTPStatus::ACLHTTPStatus (ACLHTTPStatus const & old) : data(NULL), class_ (old.class_)
-{
-    /* we don't have copy constructors for the data yet */
-    assert(!old.data);
-}
-
 ACLHTTPStatus::~ACLHTTPStatus()
 {
     if (data) {

diff --git a/src/acl/HttpStatus.h b/src/acl/HttpStatus.h
index 160ca9926b4d7c472a9221da226ef0f6acfddf37..23f915ec4b11920a92192d3311ed59aa462eac86 100644 (file)
--- a/src/acl/HttpStatus.h
+++ b/src/acl/HttpStatus.h
@@ -30,11 +30,8 @@ class ACLHTTPStatus : public ACL
 
 public:
     ACLHTTPStatus(char const *);
-    ACLHTTPStatus(ACLHTTPStatus const &);
     ~ACLHTTPStatus();
-    ACLHTTPStatus&operator=(ACLHTTPStatus const &);
 
-    virtual ACL *clone()const;
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);

diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc
index 74b2d282c0ae366241a4735327add8794c1550d4..27b9d926f73ccc0ea28d54e2fc4de59ebc5c5b87 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -64,15 +64,6 @@ ACLIntRange::match(int i)
     return false;
 }
 
-ACLData<int> *
-ACLIntRange::clone() const
-{
-    if (!ranges.empty())
-        fatal("ACLIntRange::clone: attempt to clone used ACL");
-
-    return new ACLIntRange(*this);
-}
-
 ACLIntRange::~ACLIntRange()
 {}
 

diff --git a/src/acl/IntRange.h b/src/acl/IntRange.h
index dec6b0c5cd6dc0951f197910e335994762059e2d..498fca40acbb737e510ab63200724abefb1e3571 100644 (file)
--- a/src/acl/IntRange.h
+++ b/src/acl/IntRange.h
@@ -25,7 +25,6 @@ public:
     virtual SBufList dump() const;
     virtual void parse();
     virtual bool empty() const;
-    virtual ACLData<int> *clone() const;
 
 private:
     typedef Range<int> RangeType;

diff --git a/src/acl/LocalIp.cc b/src/acl/LocalIp.cc
index 1d2a5934944f435af5584990915fdfda23207ff2..79c41b0c1f929dcb4a121c5ef10c37b1fe1785cb 100644 (file)
--- a/src/acl/LocalIp.cc
+++ b/src/acl/LocalIp.cc
@@ -24,9 +24,3 @@ ACLLocalIP::match(ACLChecklist *checklist)
     return ACLIP::match (Filled(checklist)->my_addr);
 }
 
-ACL *
-ACLLocalIP::clone() const
-{
-    return new ACLLocalIP(*this);
-}
-

diff --git a/src/acl/LocalIp.h b/src/acl/LocalIp.h
index 2a7eea55819307c6a2b81cd07ef0d54b01e66763..57188fd13900955fbe029079554c5e8925876e56 100644 (file)
--- a/src/acl/LocalIp.h
+++ b/src/acl/LocalIp.h
@@ -19,7 +19,6 @@ class ACLLocalIP : public ACLIP
 public:
     virtual char const *typeString() const;
     virtual int match(ACLChecklist *checklist);
-    virtual ACL *clone()const;
 };
 
 #endif /* SQUID_ACLLOCALIP_H */

diff --git a/src/acl/MaxConnection.cc b/src/acl/MaxConnection.cc
index 0b56fa27e009cb343fc84604501e3ddb985c5a4e..2e0f47a5bc4d8a0a7db58e54ea53376ef974c42b 100644 (file)
--- a/src/acl/MaxConnection.cc
+++ b/src/acl/MaxConnection.cc
@@ -15,18 +15,9 @@
 #include "Debug.h"
 #include "SquidConfig.h"
 
-ACL *
-ACLMaxConnection::clone() const
-{
-    return new ACLMaxConnection(*this);
-}
-
 ACLMaxConnection::ACLMaxConnection (char const *theClass) : class_ (theClass), limit(-1)
 {}
 
-ACLMaxConnection::ACLMaxConnection (ACLMaxConnection const & old) :class_ (old.class_), limit (old.limit)
-{}
-
 ACLMaxConnection::~ACLMaxConnection()
 {}
 

diff --git a/src/acl/MaxConnection.h b/src/acl/MaxConnection.h
index 6faf849babe2c897e2eb0a5f203458b1ce14e68d..14ce5089f6cf6d4f52cdeb0b90202161d6f0d84b 100644 (file)
--- a/src/acl/MaxConnection.h
+++ b/src/acl/MaxConnection.h
@@ -18,11 +18,8 @@ class ACLMaxConnection : public ACL
 
 public:
     ACLMaxConnection(char const *);
-    ACLMaxConnection(ACLMaxConnection const &);
     ~ACLMaxConnection();
-    ACLMaxConnection&operator=(ACLMaxConnection const &);
 
-    virtual ACL *clone()const;
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index 3252ac09c68e5bc3b009c39c3d4ae4238742c78a..69154e3f8d3c8ed1100bc20c9b5a2366ab26b9b6 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -16,11 +16,6 @@
 
 int ACLMethodData::ThePurgeCount = 0;
 
-ACLMethodData::ACLMethodData(ACLMethodData const &old)
-{
-    assert(old.values.empty());
-}
-
 ACLMethodData::~ACLMethodData()
 {
     values.clear();
@@ -63,10 +58,3 @@ ACLMethodData::parse()
     }
 }
 
-ACLData<HttpRequestMethod> *
-ACLMethodData::clone() const
-{
-    assert(values.empty());
-    return new ACLMethodData(*this);
-}
-

diff --git a/src/acl/MethodData.h b/src/acl/MethodData.h
index bdc112053382cd33534205f88261d6f85d02575c..b6ea55d6e477214444c8c57a24909ea97131c785 100644 (file)
--- a/src/acl/MethodData.h
+++ b/src/acl/MethodData.h
@@ -21,14 +21,11 @@ class ACLMethodData : public ACLData<HttpRequestMethod>
 
 public:
     ACLMethodData() {}
-    ACLMethodData(ACLMethodData const &);
-    ACLMethodData &operator= (ACLMethodData const &);
     virtual ~ACLMethodData();
     bool match(HttpRequestMethod);
     virtual SBufList dump() const;
     void parse();
     bool empty() const {return values.empty();}
-    virtual ACLData<HttpRequestMethod> *clone() const;
 
     std::list<HttpRequestMethod> values;
 

diff --git a/src/acl/NoteData.cc b/src/acl/NoteData.cc
index 8448ef0d4ebc980da003bd9cbdb5c93f0231402a..a8417a1288c1e886c8177868e7178e06c32b57d4 100644 (file)
--- a/src/acl/NoteData.cc
+++ b/src/acl/NoteData.cc
@@ -59,13 +59,3 @@ ACLNoteData::empty() const
     return name.isEmpty();
 }
 
-ACLData<NotePairs::Entry *> *
-ACLNoteData::clone() const
-{
-    ACLNoteData * result = new ACLNoteData;
-    result->values = dynamic_cast<ACLStringData*>(values->clone());
-    assert(result->values);
-    result->name = name;
-    return result;
-}
-

diff --git a/src/acl/NoteData.h b/src/acl/NoteData.h
index a415ffa0463a9b0f087e29559a2915e023eb0171..ceb87dd5c2cf566a45fb6718ecf44d45ac530917 100644 (file)
--- a/src/acl/NoteData.h
+++ b/src/acl/NoteData.h
@@ -27,7 +27,6 @@ public:
     virtual SBufList dump() const;
     virtual void parse();
     virtual bool empty() const;
-    virtual ACLData<NotePairs::Entry *> *clone() const;
 
 private:
     SBuf name;                   ///< Note name to check. It is always set

diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc
index fa4fe67f634c3955239207e5aa141344c3b238fd..d69ecd2c163083260d905162df2d113d62b21a2e 100644 (file)
--- a/src/acl/ProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -15,11 +15,6 @@
 #include "Debug.h"
 #include "wordlist.h"
 
-ACLProtocolData::ACLProtocolData(ACLProtocolData const &old)
-{
-    assert(old.values.empty());
-}
-
 ACLProtocolData::~ACLProtocolData()
 {
     values.clear();
@@ -68,11 +63,3 @@ ACLProtocolData::parse()
     }
 }
 
-ACLData<AnyP::ProtocolType> *
-ACLProtocolData::clone() const
-{
-    /* Splay trees don't clone yet. */
-    assert(values.empty());
-    return new ACLProtocolData(*this);
-}
-

diff --git a/src/acl/ProtocolData.h b/src/acl/ProtocolData.h
index 03a169452b900193d897da02fde6492a746157bc..6fbe09e9f96182c02ff66a5fa4de0760bf74ac5e 100644 (file)
--- a/src/acl/ProtocolData.h
+++ b/src/acl/ProtocolData.h
@@ -21,14 +21,11 @@ class ACLProtocolData : public ACLData<AnyP::ProtocolType>
 
 public:
     ACLProtocolData() {}
-    ACLProtocolData(ACLProtocolData const &);
-    ACLProtocolData &operator= (ACLProtocolData const &);
     virtual ~ACLProtocolData();
     bool match(AnyP::ProtocolType);
     virtual SBufList dump() const;
     void parse();
     bool empty() const {return values.empty();}
-    virtual ACLData<AnyP::ProtocolType> *clone() const;
 
     std::list<AnyP::ProtocolType> values;
 };

diff --git a/src/acl/Random.cc b/src/acl/Random.cc
index 17205639952fd31f08ab828373e1eca74c47f8b7..7de8edba8bb7864931abfca8d4c62e6db8234925 100644 (file)
--- a/src/acl/Random.cc
+++ b/src/acl/Random.cc
@@ -17,22 +17,11 @@
 
 #include <random>
 
-ACL *
-ACLRandom::clone() const
-{
-    return new ACLRandom(*this);
-}
-
 ACLRandom::ACLRandom(char const *theClass) : data(0.0), class_(theClass)
 {
     memset(pattern, 0, sizeof(pattern));
 }
 
-ACLRandom::ACLRandom(ACLRandom const & old) : data(old.data), class_(old.class_)
-{
-    memcpy(pattern, old.pattern, sizeof(pattern));
-}
-
 ACLRandom::~ACLRandom()
 { }
 

diff --git a/src/acl/Random.h b/src/acl/Random.h
index 92c69e0fc9f2da1b34e765476dd0cf727cd1ea10..1573f8192cb0c20af352d26fc33c1362eda994e9 100644 (file)
--- a/src/acl/Random.h
+++ b/src/acl/Random.h
@@ -17,11 +17,8 @@ class ACLRandom : public ACL
 
 public:
     ACLRandom(char const *);
-    ACLRandom(ACLRandom const &);
     ~ACLRandom();
-    ACLRandom&operator=(ACLRandom const &);
 
-    virtual ACL *clone()const;
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);

diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc
index 0a84a0c9d763bcaeb29bbbf08868aa7c728e98c0..548575759ad8d73e94da8f3dd2afe84c6f570251 100644 (file)
--- a/src/acl/RegexData.cc
+++ b/src/acl/RegexData.cc
@@ -268,11 +268,3 @@ ACLRegexData::empty() const
     return data.empty();
 }
 
-ACLData<char const *> *
-ACLRegexData::clone() const
-{
-    /* Regex's don't clone yet. */
-    assert(data.empty());
-    return new ACLRegexData;
-}
-

diff --git a/src/acl/RegexData.h b/src/acl/RegexData.h
index e78c935075b33ebf0d457505a06ec83a1a19509c..f67c85f2987625cb2d54723621f01d3ab59f0d9d 100644 (file)
--- a/src/acl/RegexData.h
+++ b/src/acl/RegexData.h
@@ -26,7 +26,6 @@ public:
     virtual void parse();
     virtual const Acl::ParameterFlags &supportedFlags() const;
     virtual bool empty() const;
-    virtual ACLData<char const *> *clone() const;
 
 private:
     std::list<RegexPattern> data;

diff --git a/src/acl/ServerName.cc b/src/acl/ServerName.cc
index 1b4e3d21cdcbf347ca9ed87ef85f5bfb572d15ec..da74395ecdbec84c194801ef8b743e2868cbef24 100644 (file)
--- a/src/acl/ServerName.cc
+++ b/src/acl/ServerName.cc
@@ -50,14 +50,6 @@ ACLServerNameData::match(const char *host)
 
 }
 
-ACLData<char const *> *
-ACLServerNameData::clone() const
-{
-    /* Splay trees don't clone yet. */
-    assert (!domains);
-    return new ACLServerNameData;
-}
-
 /// A helper function to be used with Ssl::matchX509CommonNames().
 /// \retval 0 when the name (cn or an alternate name) matches acl data
 /// \retval 1 when the name does not match

diff --git a/src/acl/ServerName.h b/src/acl/ServerName.h
index d2a37d8552b6e3e346e7d437f339ee92e5c00123..0bb4be7a68d9605b4636c57c2dcd90ed0e0e9316 100644 (file)
--- a/src/acl/ServerName.h
+++ b/src/acl/ServerName.h
@@ -18,7 +18,6 @@ class ACLServerNameData : public ACLDomainData {
 public:
     ACLServerNameData() : ACLDomainData() {}
     virtual bool match(const char *);
-    virtual ACLData<char const *> *clone() const;
 };
 
 class ACLServerNameStrategy : public ACLStrategy<char const *>

diff --git a/src/acl/SourceIp.cc b/src/acl/SourceIp.cc
index bde981c6b585a11563b5bba166403bc7ad15b6fe..10bb95300d06dcf9e03da42c3b48aa43233e9747 100644 (file)
--- a/src/acl/SourceIp.cc
+++ b/src/acl/SourceIp.cc
@@ -24,9 +24,3 @@ ACLSourceIP::match(ACLChecklist *checklist)
     return ACLIP::match(Filled(checklist)->src_addr);
 }
 
-ACL *
-ACLSourceIP::clone() const
-{
-    return new ACLSourceIP(*this);
-}
-

diff --git a/src/acl/SourceIp.h b/src/acl/SourceIp.h
index e95dcb06cac564bff80d54dcc810ba8120dc9dcc..daf3a3e92b285e6413caca3ff65e5e4a60292b5f 100644 (file)
--- a/src/acl/SourceIp.h
+++ b/src/acl/SourceIp.h
@@ -18,7 +18,6 @@ class ACLSourceIP : public ACLIP
 public:
     virtual char const *typeString() const;
     virtual int match(ACLChecklist *checklist);
-    virtual ACL *clone()const;
 };
 
 #endif /* SQUID_ACLSOURCEIP_H */

diff --git a/src/acl/SquidErrorData.cc b/src/acl/SquidErrorData.cc
index 6c59efe99cf772666bf7e01ae4350a25c703e7d1..5c7148c02ad2525017e4a956de884bcd33f9ae8b 100644 (file)
--- a/src/acl/SquidErrorData.cc
+++ b/src/acl/SquidErrorData.cc
@@ -66,12 +66,3 @@ ACLSquidErrorData::empty() const
     return errors.empty();
 }
 
-ACLData<err_type> *
-ACLSquidErrorData::clone() const
-{
-    if (!errors.empty())
-        fatal("ACLSquidError::clone: attempt to clone used ACL");
-
-    return new ACLSquidErrorData (*this);
-}
-

diff --git a/src/acl/SquidErrorData.h b/src/acl/SquidErrorData.h
index a19343dfc275b1c8560737a64f80f8b19c5a0938..3a7787f0ac732a0be5513ab34f3275e60c1501a7 100644 (file)
--- a/src/acl/SquidErrorData.h
+++ b/src/acl/SquidErrorData.h
@@ -25,7 +25,6 @@ public:
     virtual SBufList dump() const;
     virtual void parse();
     virtual bool empty() const;
-    virtual ACLData<err_type> *clone() const;
 
 private:
     CbDataListContainer <err_type> errors;

diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc
index cf06014ac513d11db3b5b8cd0d9cd37327e6835f..004415e9f177ad10982f519a224315e05aeca683 100644 (file)
--- a/src/acl/SslErrorData.cc
+++ b/src/acl/SslErrorData.cc
@@ -12,10 +12,6 @@
 #include "security/CertError.h"
 #include "ssl/ErrorDetail.h"
 
-ACLSslErrorData::ACLSslErrorData(ACLSslErrorData const &o) :
-    values(o.values)
-{}
-
 bool
 ACLSslErrorData::match(const Security::CertErrors *toFind)
 {
@@ -44,9 +40,3 @@ ACLSslErrorData::parse()
     }
 }
 
-ACLSslErrorData *
-ACLSslErrorData::clone() const
-{
-    return new ACLSslErrorData(*this);
-}
-

diff --git a/src/acl/SslErrorData.h b/src/acl/SslErrorData.h
index f7534f9846f2504e534b729ed41e7183fed46fe3..f4fd6a203247258adddca3c6ed91f7fa8acc742c 100644 (file)
--- a/src/acl/SslErrorData.h
+++ b/src/acl/SslErrorData.h
@@ -19,14 +19,11 @@ class ACLSslErrorData : public ACLData<const Security::CertErrors *>
 
 public:
     ACLSslErrorData() = default;
-    ACLSslErrorData(ACLSslErrorData const &);
-    ACLSslErrorData &operator= (ACLSslErrorData const &);
     virtual ~ACLSslErrorData() {}
     bool match(const Security::CertErrors *);
     virtual SBufList dump() const;
     void parse();
     bool empty() const { return values.empty(); }
-    virtual  ACLSslErrorData *clone() const;
 
     Security::Errors values;
 };

diff --git a/src/acl/Strategised.h b/src/acl/Strategised.h
index b933257cf602dd07c73d09dd23d0421566c927fe..4c9d18b91559176a9e9b99b47e6ec33adf434fb1 100644 (file)
--- a/src/acl/Strategised.h
+++ b/src/acl/Strategised.h
@@ -34,7 +34,6 @@ public:
 
     ~ACLStrategised();
     ACLStrategised(ACLData<MatchType> *, ACLStrategy<MatchType> *, char const *);
-    ACLStrategised(ACLStrategised const &&) = delete;
 
     virtual char const *typeString() const;
     virtual void parseFlags();

diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index 3bec669a2ca770d00b448c8da4cb0d93150bfc3a..e1fcfe7c2ec8d982d2efb216bf64e0376bc7a78e 100644 (file)
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -14,10 +14,6 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 
-ACLStringData::ACLStringData(ACLStringData const &old) : stringValues(old.stringValues)
-{
-}
-
 void
 ACLStringData::insert(const char *value)
 {
@@ -66,10 +62,3 @@ ACLStringData::empty() const
     return stringValues.empty();
 }
 
-ACLData<char const *> *
-ACLStringData::clone() const
-{
-    /* Splay trees don't clone yet. */
-    return new ACLStringData(*this);
-}
-

diff --git a/src/acl/StringData.h b/src/acl/StringData.h
index bacc0bd2506fdac5f24328aa0b679fcc70192272..96affd403357369e1ba0e3a662f83332fed2a1d6 100644 (file)
--- a/src/acl/StringData.h
+++ b/src/acl/StringData.h
@@ -21,8 +21,6 @@ class ACLStringData : public ACLData<char const *>
 
 public:
     ACLStringData() {}
-    ACLStringData(ACLStringData const &);
-    ACLStringData &operator= (ACLStringData const &);
     virtual ~ACLStringData() {}
     /// \deprecated use match(SBuf&) instead.
     bool match(char const *);
@@ -30,7 +28,7 @@ public:
     virtual SBufList dump() const;
     virtual void parse();
     bool empty() const;
-    virtual ACLData<char const *> *clone() const;
+
     /// Insert a string data value
     void insert(const char *);
 

diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc
index 7220772293a01909e34ef120a38594b8fd2e7da1..63bc80e581ec223b29550ff4ccbdb2f936c046dd 100644 (file)
--- a/src/acl/TimeData.cc
+++ b/src/acl/TimeData.cc
@@ -28,26 +28,6 @@
 
 ACLTimeData::ACLTimeData () : weekbits (0), start (0), stop (0), next (NULL) {}
 
-ACLTimeData::ACLTimeData(ACLTimeData const &old) : weekbits(old.weekbits), start (old.start), stop (old.stop), next (NULL)
-{
-    if (old.next)
-        next = (ACLTimeData *)old.next->clone();
-}
-
-ACLTimeData&
-ACLTimeData::operator=(ACLTimeData const &old)
-{
-    weekbits = old.weekbits;
-    start = old.start;
-    stop = old.stop;
-    next = NULL;
-
-    if (old.next)
-        next = (ACLTimeData *)old.next->clone();
-
-    return *this;
-}
-
 ACLTimeData::~ACLTimeData()
 {
     if (next)
@@ -236,9 +216,3 @@ ACLTimeData::empty() const
     return false;
 }
 
-ACLData<time_t> *
-ACLTimeData::clone() const
-{
-    return new ACLTimeData(*this);
-}
-

diff --git a/src/acl/TimeData.h b/src/acl/TimeData.h
index fa20b7850a2ae668a8ccdca61003be809ff744a3..15c755c943f61595d35882d00ac34d099e6efa29 100644 (file)
--- a/src/acl/TimeData.h
+++ b/src/acl/TimeData.h
@@ -18,14 +18,11 @@ class ACLTimeData : public ACLData<time_t>
 
 public:
     ACLTimeData();
-    ACLTimeData(ACLTimeData const &);
-    ACLTimeData&operator=(ACLTimeData const &);
     virtual ~ACLTimeData();
     bool match(time_t);
     virtual SBufList dump() const;
     void parse();
     bool empty() const;
-    virtual ACLData<time_t> *clone() const;
 
 private:
     int weekbits;

diff --git a/src/acl/TransactionInitiator.cc b/src/acl/TransactionInitiator.cc
index 13d6ebd647c3d67a68c6e94148dbe0bf44eb0965..b4e8ae991cb4e503668d2e729e33a816f788ddce 100644 (file)
--- a/src/acl/TransactionInitiator.cc
+++ b/src/acl/TransactionInitiator.cc
@@ -17,12 +17,6 @@
 #include "MasterXaction.h"
 #include "SquidConfig.h"
 
-ACL *
-Acl::TransactionInitiator::clone() const
-{
-    return new Acl::TransactionInitiator(*this);
-}
-
 Acl::TransactionInitiator::TransactionInitiator (const char *aClass) : class_ (aClass), initiators_(0)
 {}
 

diff --git a/src/acl/TransactionInitiator.h b/src/acl/TransactionInitiator.h
index f38e69bb69a4ba8d0c8d2ba1941af7b0c00dd210..c7897b73307f7d04ff569cbefcc53d802aae011d 100644 (file)
--- a/src/acl/TransactionInitiator.h
+++ b/src/acl/TransactionInitiator.h
@@ -24,7 +24,6 @@ class TransactionInitiator : public ACL
 public:
     TransactionInitiator(char const *);
 
-    virtual ACL *clone()const;
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);

diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index 13c639b64a94d5ef7962e5c443c941aa461684ac..7f7de9f8717d857f7418badb635f6306099c1e65 100644 (file)
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -145,9 +145,3 @@ ACLUserData::empty() const
     return userDataNames.empty();
 }
 
-ACLData<char const *> *
-ACLUserData::clone() const
-{
-    return new ACLUserData;
-}
-

diff --git a/src/acl/UserData.h b/src/acl/UserData.h
index 81fe77fd68a984e530727f0a2a8a76327c38288b..3e3d0315bd73716bca4791496ca5d6663cd4f6d9 100644 (file)
--- a/src/acl/UserData.h
+++ b/src/acl/UserData.h
@@ -27,7 +27,6 @@ public:
     void parse();
     virtual const Acl::ParameterFlags &supportedFlags() const;
     bool empty() const;
-    virtual ACLData<char const *> *clone() const;
 
 private:
 

diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc
index 83939aa2c5aecbab2e9108e1f2fdaf35ed261860..1788f10ce75e0ea5393a69a0613d3f648609e8bf 100644 (file)
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -23,12 +23,6 @@ ACLMaxUserIP::ACLMaxUserIP(char const *theClass) :
     maximum(0)
 {}
 
-ACL *
-ACLMaxUserIP::clone() const
-{
-    return new ACLMaxUserIP(*this);
-}
-
 char const *
 ACLMaxUserIP::typeString() const
 {

diff --git a/src/auth/AclMaxUserIp.h b/src/auth/AclMaxUserIp.h
index 998d39009e77e617e0f4e382b008bb2a31fe337e..a999767b742de0c7f6245323ff78041686384568 100644 (file)
--- a/src/auth/AclMaxUserIp.h
+++ b/src/auth/AclMaxUserIp.h
@@ -21,7 +21,6 @@ class ACLMaxUserIP : public ACL
 public:
     explicit ACLMaxUserIP(char const *theClass);
 
-    virtual ACL *clone() const;
     virtual char const *typeString() const;
     virtual const Acl::Options &options();
     virtual void parse();

diff --git a/src/auth/AclProxyAuth.cc b/src/auth/AclProxyAuth.cc
index 429cde80fcadd4e607a1c566f2a8cb63c13bcac7..b3bed5c3ec573db3b78a8af2dc31ac361e195214 100644 (file)
--- a/src/auth/AclProxyAuth.cc
+++ b/src/auth/AclProxyAuth.cc
@@ -31,19 +31,6 @@ ACLProxyAuth::ACLProxyAuth(ACLData<char const *> *newData, char const *theType)
     type_(theType)
 {}
 
-ACLProxyAuth::ACLProxyAuth(ACLProxyAuth const &old) :
-    data(old.data->clone()),
-    type_(old.type_)
-{}
-
-ACLProxyAuth &
-ACLProxyAuth::operator=(ACLProxyAuth const &rhs)
-{
-    data = rhs.data->clone();
-    type_ = rhs.type_;
-    return *this;
-}
-
 char const *
 ACLProxyAuth::typeString() const
 {
@@ -155,12 +142,6 @@ ProxyAuthLookup::LookupDone(void *data)
     checklist->resumeNonBlockingCheck(ProxyAuthLookup::Instance());
 }
 
-ACL *
-ACLProxyAuth::clone() const
-{
-    return new ACLProxyAuth(*this);
-}
-
 int
 ACLProxyAuth::matchForCache(ACLChecklist *cl)
 {

diff --git a/src/auth/AclProxyAuth.h b/src/auth/AclProxyAuth.h
index 4244f2d6f6a98811889928a533f7bdfc45927c71..60d290e416c6ae2d1d44501b2ea18ad31bde27c4 100644 (file)
--- a/src/auth/AclProxyAuth.h
+++ b/src/auth/AclProxyAuth.h
@@ -34,8 +34,6 @@ class ACLProxyAuth : public ACL
 public:
     ~ACLProxyAuth();
     ACLProxyAuth(ACLData<char const *> *, char const *);
-    ACLProxyAuth(ACLProxyAuth const &);
-    ACLProxyAuth &operator =(ACLProxyAuth const &);
 
     /* ACL API */
     virtual char const *typeString() const;
@@ -47,7 +45,6 @@ public:
     virtual bool valid() const;
     virtual bool empty() const;
     virtual bool requiresRequest() const {return true;}
-    virtual ACL *clone() const;
     virtual int matchForCache(ACLChecklist *checklist);
 
 private:

diff --git a/src/external_acl.cc b/src/external_acl.cc
index fb3163d1f44ba2232c4be020567030740ae46878..52c03e5d11459f9999a159c7f4e00e2e0f9c95d3 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1169,21 +1169,9 @@ ExternalACLLookup::LookupDone(void *data, const ExternalACLEntryPointer &result)
     checklist->resumeNonBlockingCheck(ExternalACLLookup::Instance());
 }
 
-ACL *
-ACLExternal::clone() const
-{
-    return new ACLExternal(*this);
-}
-
 ACLExternal::ACLExternal(char const *theClass) : data(NULL), class_(xstrdup(theClass))
 {}
 
-ACLExternal::ACLExternal(ACLExternal const & old) : data(NULL), class_(old.class_ ? xstrdup(old.class_) : NULL)
-{
-    /* we don't have copy constructors for the data yet */
-    assert(!old.data);
-}
-
 char const *
 ACLExternal::typeString() const
 {

diff --git a/src/ident/AclIdent.cc b/src/ident/AclIdent.cc
index 32e977af0526b3a8a713ed75597b9b3d4d3f5a78..d944e26ee80747486f1eab2eec5edce0f534b31f 100644 (file)
--- a/src/ident/AclIdent.cc
+++ b/src/ident/AclIdent.cc
@@ -29,17 +29,6 @@ ACLIdent::~ACLIdent()
 
 ACLIdent::ACLIdent(ACLData<char const *> *newData, char const *newType) : data (newData), type_ (newType) {}
 
-ACLIdent::ACLIdent (ACLIdent const &old) : data (old.data->clone()), type_ (old.type_)
-{}
-
-ACLIdent &
-ACLIdent::operator= (ACLIdent const &rhs)
-{
-    data = rhs.data->clone();
-    type_ = rhs.type_;
-    return *this;
-}
-
 char const *
 ACLIdent::typeString() const
 {
@@ -98,12 +87,6 @@ ACLIdent::empty () const
     return data->empty();
 }
 
-ACL *
-ACLIdent::clone() const
-{
-    return new ACLIdent(*this);
-}
-
 IdentLookup IdentLookup::instance_;
 
 IdentLookup *

diff --git a/src/ident/AclIdent.h b/src/ident/AclIdent.h
index 503cb141c208b217134ac65e17fd119c7c520f6c..c788871e87a436c6732a0d98184c07e7e566b742 100644 (file)
--- a/src/ident/AclIdent.h
+++ b/src/ident/AclIdent.h
@@ -36,8 +36,6 @@ class ACLIdent : public ACL
 
 public:
     ACLIdent(ACLData<char const *> *newData, char const *);
-    ACLIdent (ACLIdent const &old);
-    ACLIdent & operator= (ACLIdent const &rhs);
     ~ACLIdent();
 
     /* ACL API */
@@ -48,7 +46,6 @@ public:
     virtual int match(ACLChecklist *checklist);
     virtual SBufList dump() const;
     virtual bool empty () const;
-    virtual ACL *clone()const;
 
 private:
     ACLData<char const *> *data;

diff --git a/src/tests/stub_libauth_acls.cc b/src/tests/stub_libauth_acls.cc
index 0763d56a51d948c947f295a31b4ed9d8fa18ae3b..9461607412bd2f58e19d066a218fcaa02b66801f 100644 (file)
--- a/src/tests/stub_libauth_acls.cc
+++ b/src/tests/stub_libauth_acls.cc
@@ -18,7 +18,6 @@
 Acl::Answer AuthenticateAcl(ACLChecklist *) STUB_RETVAL(ACCESS_DENIED)
 
 #include "auth/AclMaxUserIp.h"
-ACL * ACLMaxUserIP::clone() const STUB_RETVAL(NULL)
 ACLMaxUserIP::ACLMaxUserIP (char const *) STUB
 char const * ACLMaxUserIP::typeString() const STUB_RETVAL(NULL)
 bool ACLMaxUserIP::empty () const STUB_RETVAL(false)
@@ -32,8 +31,6 @@ const Acl::Options &ACLMaxUserIP::options() STUB_RETVAL(Acl::NoOptions())
 #include "auth/AclProxyAuth.h"
 ACLProxyAuth::~ACLProxyAuth() STUB
 ACLProxyAuth::ACLProxyAuth(ACLData<char const *> *, char const *) STUB
-ACLProxyAuth::ACLProxyAuth (ACLProxyAuth const &) STUB
-ACLProxyAuth & ACLProxyAuth::operator= (ACLProxyAuth const & a) STUB_RETVAL(const_cast<ACLProxyAuth &>(a))
 char const * ACLProxyAuth::typeString() const STUB_RETVAL(NULL)
 void ACLProxyAuth::parse() STUB
 int ACLProxyAuth::match(ACLChecklist *) STUB_RETVAL(0)
@@ -43,7 +40,6 @@ bool ACLProxyAuth::valid () const STUB_RETVAL(false)
 ProxyAuthLookup * ProxyAuthLookup::Instance() STUB_RETVAL(NULL)
 void ProxyAuthLookup::checkForAsync(ACLChecklist *) const STUB
 void ProxyAuthLookup::LookupDone(void *) STUB
-ACL * ACLProxyAuth::clone() const STUB_RETVAL(NULL)
 int ACLProxyAuth::matchForCache(ACLChecklist *) STUB_RETVAL(0)
 int ACLProxyAuth::matchProxyAuth(ACLChecklist *) STUB_RETVAL(0)
 void ACLProxyAuth::parseFlags() STUB