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 1c141eae5f004a258a3dcf3de5234d149a7a56d6..6298c269992760f6021ceb5b67a04f7a7c48f3f8 100644 (file)
--- 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 ac950e1fc2939fa5fc555039379e189711a2db8c..3d808d855cae32a65cf512773becf2605a69421b 100644 (file)
--- 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 8453f05a318606f57d424a1629e95c6684396c88..1874bbd2e3406e7968012776aed031dcd397688f 100644 (file)
--- 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 537c6c9a34bd9b9d9318d94dc3d508ecb45fcdb7..0dcba971c9e1b6b88122ad4660bd176b429e7439 100644 (file)
--- 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 bb653742cd48326746b1adf03d3cb02b3b5c9ec8..181c05a82603cdb07dc066d25ca77c0ef72fbb4a 100644 (file)
--- 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 f9fa61e0ba0d7b16c49070bc309c978ee0d7d01e..e67107a3133640f8bd8de621d92f3a38ce384ddb 100644 (file)
--- 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 bd1028e18fb5dbdd17681d07dc48afdff621a971..83ad9f5285a61d83a4fdeb82c315bf1b7e88802d 100644 (file)
--- 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 e6d67b843b1ae6da10e378cd293fa35097c4444d..bdd98c537d72b6e366ef12e2766c78fe14fb22ba 100644 (file)
--- 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 a6fc39ddb720903ce68a5d14a63b9b5cc63eebc1..0808a5f010b6c343fec3a2eaada549a6a4bd3b9c 100644 (file)
--- 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 fe4f54cbf4f1df9cb92b1d6ca064a0cb0657da08..933c22d87b90cf9a637db0481239626debbfeb61 100644 (file)
--- 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 2365974aa1969658d9a36478f70e8a85c10dbf00..1cdb5f460416199e60420f4c8db3c717ea995577 100644 (file)
--- 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 520863954b50574dee9eef43d926041acd65c1f7..aecc4f2506194814ec822a1ed2afc486fbe008c2 100644 (file)
--- 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 b0b37fc33e0e6a6c4f2bf4c2c95d04b73724445a..18407a61e117d67d410ba4595b8985ad6b50c204 100644 (file)
--- 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 155e0eb58f30cc7b237d464e58cd3db3ed799699..e7e2d8e1016b9041ecea256b4787efe9982c1963 100644 (file)
--- 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 f05e6220ac763a5173442256d127a30bc6996c13..6506b0a2b0e5c49d7e4bdae1576b4bf6d23866ea 100644 (file)
--- 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 f7aacc50e6185cf7d63e63484cf78a42e60fcf17..4aed5ea976cf410aa760a977a8083e3c2833d49a 100644 (file)
--- 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 2476d359fbd6f465466d3a51a7f43da3a4ea069d..ad9f20ad35487724a358009f8bd78e6cd38381a0 100644 (file)
--- 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);
-}