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 ffb100a44b85600474ad25a88f548699a9a4f722..cc12b18bfe170eb4c6856b6585c8072a7d6055ca 100644 (file)
--- 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 56889a73c27f7b2c0ea5beff330132d9e8a99204..5c1d062c5f3491ddb8065ae87493a2674f7df795 100644 (file)
--- 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 35b1db3c48f8eaa1e6a15deb3f9f8fed2a84326d..fedb6b279e6891d670da0316304866020bb42a05 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 613dce632e4afe1bbbf212c42aec7d6e0e93efcf..bb365513fd974de0d3d0d0a7c305d88779f98ad8 100644 (file)
--- 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 c794f114613bd0e43966b346272a9dd99fb9e4c1..74cae6aa7a1a5d9416b86e286aa90ec38f4a30ff 100644 (file)
--- 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 ef2aa6205c21d5310790424996c7491326c49238..322fdc8f25f17996a47143bb99a0fd64430ba66c 100644 (file)
--- 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 9f5aaa9fe80fe831203da94550e119e5f9b3be58..034a07dbc5cf4dcd7dfa4fd0cd659d5c5e5dd052 100644 (file)
--- 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 364dbe1eb31e81f9f1f02de9043186196826ef8f..175995093d9444949d97f5843e5db593cb20da36 100644 (file)
--- 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 0c0b9d225361c066abb3184374c323fe59a5c598..ed8db0ed95f5a648e174114ded4f8a6bc9750213 100644 (file)
--- 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 de630cc538a0545847f395ea2cefd1cf53cf9daf..b56af190b36a56b7dd8231e8eba013494d26cdd5 100644 (file)
--- 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 e13a21ccfb0d8a9d1d20b0c2c1cacb07461773a5..c71f010dcabf5cac6c3cba1a839a8e63c21ef838 100644 (file)
--- 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 17847010ad8c3972a781df5d21d2578de13da215..bf8ab94d92cb5f1cb727f4625b77162d6cdefce0 100644 (file)
--- 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 6d82de0455e1ab6d4f84880cb03b719f9af7d1bf..b8254cd77200cfff5e4b7d33731de52a21afc3e1 100644 (file)
--- 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 e3c53d7412378cf5ed3d30719b38f4b4ef52ae24..94ecc6997dd692874162fc8a785ad368316d8048 100644 (file)
--- 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 4c0af9d0382b9010e263680cdca050c28e1c7f39..fbc20a97978ac17e8f1a132d84d7c5be559c6742 100644 (file)
--- 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 b6c27dbf72b949408db26bf8c243f3d940cda741..e5ee4ff189d2bebc9fa8098508b5dc52f95eb648 100644 (file)
--- 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 2d7fe11e3150ea3a57b11adc53dee616768436f1..8ee906e2dab4aa83e4528351d55d70fd1e38c2c0 100644 (file)
--- 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);