Resolve ASan errors that will be thrown once it is turned on
Plus few minor spelling and code-style issues
refs: #4230
Change-Id: Ia665bab546a9628347af45836dcbe765dc91c54f
diff --git a/src/route/name-prefix-table.cpp b/src/route/name-prefix-table.cpp
index 6467790..251bfc5 100644
--- a/src/route/name-prefix-table.cpp
+++ b/src/route/name-prefix-table.cpp
@@ -45,8 +45,8 @@
// Check if the advertised name prefix is in the table already.
NptEntryList::iterator nameItr = std::find(m_table.begin(),
- m_table.end(),
- name);
+ m_table.end(),
+ name);
// Attempt to find a routing table pool entry (RTPE) we can use.
RtpEntryMap::iterator rtpeItr = m_rtpool.find(destRouter);
@@ -139,9 +139,8 @@
std::shared_ptr<RoutingTablePoolEntry> rtpePtr = rtpeItr->second;
// Ensure that the entry exists
- NptEntryList::iterator nameItr = std::find_if(m_table.begin(),
- m_table.end(),
- std::bind(&npteCompare, _1, name));
+ NptEntryList::iterator nameItr = std::find_if(m_table.begin(), m_table.end(),
+ std::bind(&npteCompare, _1, name));
if (nameItr != m_table.end()) {
_LOG_TRACE("Removing origin: " << rtpePtr->getDestination()
<< " from prefix: " << *nameItr);
@@ -182,7 +181,7 @@
}
else {
_LOG_DEBUG("Attempted to remove origin: " << rtpePtr->getDestination()
- << " from non-existant prefix: " << name);
+ << " from non-existent prefix: " << name);
}
}
@@ -239,7 +238,7 @@
NamePrefixTable::deleteRtpeFromPool(std::shared_ptr<RoutingTablePoolEntry> rtpePtr)
{
if (m_rtpool.erase(rtpePtr->getDestination()) != 1) {
- _LOG_DEBUG("Attempted to delete non-existant origin: "
+ _LOG_DEBUG("Attempted to delete non-existent origin: "
<< rtpePtr->getDestination()
<< " from NPT routing table entry storage pool.");
}