From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 29 Nov 2012 08:51:27 +0000 (-0700)
Subject: Remove unnecessary xmemset()
X-Git-Tag: SQUID_3_4_0_1~468
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e297be13e865e00886cb31015f014c8f8da18fee;p=thirdparty%2Fsquid.git

Remove unnecessary xmemset()

Was a simple wrapper around memset() to add debugs() traces. However
other profiling tools can trace memset far better.
---

diff --git a/src/DiskIO/DiskDaemon/DiskdAction.cc b/src/DiskIO/DiskDaemon/DiskdAction.cc
index ffb100a44b..cc12b18bfe 100644
--- a/src/DiskIO/DiskDaemon/DiskdAction.cc
+++ b/src/DiskIO/DiskDaemon/DiskdAction.cc
@@ -15,7 +15,7 @@
 
 DiskdActionData::DiskdActionData()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 DiskdActionData&
diff --git a/src/StoreStats.cc b/src/StoreStats.cc
index 56889a73c2..5c1d062c5f 100644
--- a/src/StoreStats.cc
+++ b/src/StoreStats.cc
@@ -11,7 +11,7 @@
 
 StoreInfoStats::StoreInfoStats()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 StoreInfoStats &
@@ -52,6 +52,6 @@ StoreInfoStats::operator +=(const StoreInfoStats &stats)
 
 StoreIoStats::StoreIoStats()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
diff --git a/src/ipc/SharedListen.cc b/src/ipc/SharedListen.cc
index 35b1db3c48..fedb6b279e 100644
--- a/src/ipc/SharedListen.cc
+++ b/src/ipc/SharedListen.cc
@@ -45,7 +45,7 @@ AddToMap(const PendingOpenRequest &por)
 
 Ipc::OpenListenerParams::OpenListenerParams()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 bool
diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc
index 613dce632e..bb365513fd 100644
--- a/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@ -270,8 +270,8 @@ Ipc::StoreMap::freeLocked(Slot &s, bool keepLocked)
 
 Ipc::StoreMapSlot::StoreMapSlot(): state(Empty)
 {
-    xmemset(&key, 0, sizeof(key));
-    xmemset(&basics, 0, sizeof(basics));
+    memset(&key, 0, sizeof(key));
+    memset(&basics, 0, sizeof(basics));
 }
 
 void
diff --git a/src/ipc/TypedMsgHdr.cc b/src/ipc/TypedMsgHdr.cc
index c794f11461..74cae6aa7a 100644
--- a/src/ipc/TypedMsgHdr.cc
+++ b/src/ipc/TypedMsgHdr.cc
@@ -12,7 +12,7 @@
 
 Ipc::TypedMsgHdr::TypedMsgHdr()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
     sync();
 }
 
@@ -204,7 +204,7 @@ Ipc::TypedMsgHdr::getFd() const
 void
 Ipc::TypedMsgHdr::prepForReading()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
     allocName();
     allocData();
     allocControl();
diff --git a/src/mgr/CountersAction.cc b/src/mgr/CountersAction.cc
index ef2aa6205c..322fdc8f25 100644
--- a/src/mgr/CountersAction.cc
+++ b/src/mgr/CountersAction.cc
@@ -17,7 +17,7 @@ void DumpCountersStats(Mgr::CountersActionData& stats, StoreEntry* sentry);
 
 Mgr::CountersActionData::CountersActionData()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 Mgr::CountersActionData&
diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc
index 9f5aaa9fe8..034a07dbc5 100644
--- a/src/mgr/InfoAction.cc
+++ b/src/mgr/InfoAction.cc
@@ -25,7 +25,7 @@ void DumpMallocStatistics(StoreEntry* sentry);
 
 Mgr::InfoActionData::InfoActionData()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 Mgr::InfoActionData&
diff --git a/src/mgr/IntervalAction.cc b/src/mgr/IntervalAction.cc
index 364dbe1eb3..175995093d 100644
--- a/src/mgr/IntervalAction.cc
+++ b/src/mgr/IntervalAction.cc
@@ -17,7 +17,7 @@ void DumpAvgStat(Mgr::IntervalActionData& stats, StoreEntry* sentry);
 
 Mgr::IntervalActionData::IntervalActionData()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 Mgr::IntervalActionData&
diff --git a/src/mgr/IoAction.cc b/src/mgr/IoAction.cc
index 0c0b9d2253..ed8db0ed95 100644
--- a/src/mgr/IoAction.cc
+++ b/src/mgr/IoAction.cc
@@ -18,7 +18,7 @@ void DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry);
 
 Mgr::IoActionData::IoActionData()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 Mgr::IoActionData&
diff --git a/src/mgr/ServiceTimesAction.cc b/src/mgr/ServiceTimesAction.cc
index de630cc538..b56af190b3 100644
--- a/src/mgr/ServiceTimesAction.cc
+++ b/src/mgr/ServiceTimesAction.cc
@@ -16,7 +16,7 @@ void DumpServiceTimesStats(Mgr::ServiceTimesActionData& stats, StoreEntry* sentr
 
 Mgr::ServiceTimesActionData::ServiceTimesActionData()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 Mgr::ServiceTimesActionData&
diff --git a/src/mgr/StoreIoAction.cc b/src/mgr/StoreIoAction.cc
index e13a21ccfb..c71f010dca 100644
--- a/src/mgr/StoreIoAction.cc
+++ b/src/mgr/StoreIoAction.cc
@@ -13,7 +13,7 @@
 
 Mgr::StoreIoActionData::StoreIoActionData()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 Mgr::StoreIoActionData&
diff --git a/src/snmp/Pdu.cc b/src/snmp/Pdu.cc
index 17847010ad..bf8ab94d92 100644
--- a/src/snmp/Pdu.cc
+++ b/src/snmp/Pdu.cc
@@ -41,7 +41,7 @@ Snmp::Pdu::operator = (const Pdu& pdu)
 void
 Snmp::Pdu::init()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
     errstat = SNMP_DEFAULT_ERRSTAT;
     errindex = SNMP_DEFAULT_ERRINDEX;
 }
diff --git a/src/snmp/Session.cc b/src/snmp/Session.cc
index 6d82de0455..b8254cd772 100644
--- a/src/snmp/Session.cc
+++ b/src/snmp/Session.cc
@@ -35,7 +35,7 @@ Snmp::Session::operator = (const Session& session)
 void
 Snmp::Session::clear()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 void
diff --git a/src/snmp/Var.cc b/src/snmp/Var.cc
index e3c53d7412..94ecc6997d 100644
--- a/src/snmp/Var.cc
+++ b/src/snmp/Var.cc
@@ -40,7 +40,7 @@ Snmp::Var::operator = (const Var& var)
 void
 Snmp::Var::init()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 Snmp::Var&
diff --git a/src/tests/stub_tools.cc b/src/tests/stub_tools.cc
index 4c0af9d038..fbc20a9797 100644
--- a/src/tests/stub_tools.cc
+++ b/src/tests/stub_tools.cc
@@ -66,10 +66,3 @@ void setUmask(mode_t mask) STUB
 void strwordquote(MemBuf * mb, const char *str) STUB
 void keepCapabilities(void) STUB
 void restoreCapabilities(int keep) STUB
-
-void*
-xmemset(void* dst, int val, size_t sz)
-{
-    assert(dst);
-    return memset(dst, val, sz);
-}
diff --git a/src/tools.cc b/src/tools.cc
index b6c27dbf72..e5ee4ff189 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1333,13 +1333,3 @@ restoreCapabilities(int keep)
     Ip::Interceptor.StopTransparency("Missing needed capability support.");
 #endif /* HAVE_SYS_CAPABILITY_H */
 }
-
-void *
-xmemset(void *dst, int val, size_t sz)
-{
-    // do debugs output
-    debugs(63, 9, "memset: dst=" << dst << ", val=" << val << ", bytes=" << sz);
-
-    // call the system one to do the actual work ~safely.
-    return memset(dst, val, sz);
-}
diff --git a/src/tools.h b/src/tools.h
index 2d7fe11e31..8ee906e2da 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -91,7 +91,6 @@ int NumberOfKids();
 String ProcessRoles();
 
 void debug_trap(const char *);
-void *xmemset(void *dst, int, size_t);
 
 void logsFlush(void);