From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 2 Dec 2012 08:09:13 +0000 (-0700)
Subject: Remove unnecessary xmemset()
X-Git-Tag: SQUID_3_2_4~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b6a749bfaae5c0edc54d89b124ad74484dc952d4;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 1c141eae5f..6298c26999 100644
--- a/src/DiskIO/DiskDaemon/DiskdAction.cc
+++ b/src/DiskIO/DiskDaemon/DiskdAction.cc
@@ -17,7 +17,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 ac950e1fc2..3d808d855c 100644
--- a/src/StoreStats.cc
+++ b/src/StoreStats.cc
@@ -14,7 +14,7 @@
 
 StoreInfoStats::StoreInfoStats()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 StoreInfoStats &
@@ -57,6 +57,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 8453f05a31..1874bbd2e3 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 537c6c9a34..0dcba971c9 100644
--- a/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@ -272,8 +272,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 bb653742cd..181c05a826 100644
--- a/src/ipc/TypedMsgHdr.cc
+++ b/src/ipc/TypedMsgHdr.cc
@@ -14,7 +14,7 @@
 
 Ipc::TypedMsgHdr::TypedMsgHdr()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
     sync();
 }
 
@@ -208,7 +208,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 f9fa61e0ba..e67107a313 100644
--- a/src/mgr/CountersAction.cc
+++ b/src/mgr/CountersAction.cc
@@ -19,7 +19,7 @@ extern 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 bd1028e18f..83ad9f5285 100644
--- a/src/mgr/InfoAction.cc
+++ b/src/mgr/InfoAction.cc
@@ -26,7 +26,7 @@ extern 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 e6d67b843b..bdd98c537d 100644
--- a/src/mgr/IntervalAction.cc
+++ b/src/mgr/IntervalAction.cc
@@ -19,7 +19,7 @@ extern 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 a6fc39ddb7..0808a5f010 100644
--- a/src/mgr/IoAction.cc
+++ b/src/mgr/IoAction.cc
@@ -19,7 +19,7 @@ extern 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 fe4f54cbf4..933c22d87b 100644
--- a/src/mgr/ServiceTimesAction.cc
+++ b/src/mgr/ServiceTimesAction.cc
@@ -18,7 +18,7 @@ extern void DumpServiceTimesStats(Mgr::ServiceTimesActionData& stats, StoreEntry
 
 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 2365974aa1..1cdb5f4604 100644
--- a/src/mgr/StoreIoAction.cc
+++ b/src/mgr/StoreIoAction.cc
@@ -15,7 +15,7 @@
 
 Mgr::StoreIoActionData::StoreIoActionData()
 {
-    xmemset(this, 0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
 }
 
 Mgr::StoreIoActionData&
diff --git a/src/protos.h b/src/protos.h
index 520863954b..aecc4f2506 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -519,9 +519,6 @@ SQUIDCEXTERN int NumberOfKids();
 String ProcessRoles();
 SQUIDCEXTERN int DebugSignal;
 
-/* AYJ debugs function to show locations being reset with memset() */
-SQUIDCEXTERN void *xmemset(void *dst, int, size_t);
-
 SQUIDCEXTERN void debug_trap(const char *);
 SQUIDCEXTERN void logsFlush(void);
 SQUIDCEXTERN const char *checkNullString(const char *p);
diff --git a/src/snmp/Pdu.cc b/src/snmp/Pdu.cc
index b0b37fc33e..18407a61e1 100644
--- a/src/snmp/Pdu.cc
+++ b/src/snmp/Pdu.cc
@@ -44,7 +44,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 155e0eb58f..e7e2d8e101 100644
--- a/src/snmp/Session.cc
+++ b/src/snmp/Session.cc
@@ -38,7 +38,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 f05e6220ac..6506b0a2b0 100644
--- a/src/snmp/Var.cc
+++ b/src/snmp/Var.cc
@@ -42,7 +42,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 f7aacc50e6..4aed5ea976 100644
--- a/src/tests/stub_tools.cc
+++ b/src/tests/stub_tools.cc
@@ -47,13 +47,6 @@ death(int sig)
     fatal("tools.cc required");
 }
 
-void*
-xmemset(void* dst, int val, size_t sz)
-{
-    assert(dst);
-    return memset(dst, val, sz);
-}
-
 bool
 IamWorkerProcess()
 {
diff --git a/src/tools.cc b/src/tools.cc
index 2476d359fb..ad9f20ad35 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1385,13 +1385,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);
-}