F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

internet: Reduce code nesting by early returning and simplify code

Browse Source
This commit is contained in:
Eduardo Almeida
2025-02-07 00:46:02 +00:00
parent c5125c111d
commit 538c2bdab1
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/internet/model/ipv4-interface.cc
View File

@@ -323,24 +323,22 @@ Ipv4InterfaceAddress
Ipv4Interface::GetAddress(uint32_t index) const
{
NS_LOG_FUNCTION(this << index);
if (index < m_ifaddrs.size())
{
uint32_t tmp = 0;
for (auto i = m_ifaddrs.begin(); i != m_ifaddrs.end(); i++)
{
if (tmp == index)
{
return *i;
}
++tmp;
}
}
else
if (index >= m_ifaddrs.size())
{
NS_FATAL_ERROR("index " << index << " out of bounds");
}
Ipv4InterfaceAddress addr;
return addr; // quiet compiler
uint32_t tmp = 0;
for (auto i = m_ifaddrs.begin(); i != m_ifaddrs.end(); i++)
{
if (tmp == index)
{
return *i;
}
++tmp;
}
return {}; // quiet compiler
}
Ipv4InterfaceAddress
@@ -351,16 +349,16 @@ Ipv4Interface::RemoveAddress(uint32_t index)
{
NS_FATAL_ERROR("Bug in Ipv4Interface::RemoveAddress");
}
auto i = m_ifaddrs.begin();
uint32_t tmp = 0;
while (i != m_ifaddrs.end())
for (auto it = m_ifaddrs.begin(); it != m_ifaddrs.end(); it++)
{
if (tmp == index)
{
// NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
Ipv4InterfaceAddress addr = *i;
Ipv4InterfaceAddress addr = *it;
m_ifaddrs.erase(i);
m_ifaddrs.erase(it);
if (!m_removeAddressCallback.IsNull())
{
m_removeAddressCallback(this, addr);
@@ -368,11 +366,9 @@ Ipv4Interface::RemoveAddress(uint32_t index)
return addr;
}
++tmp;
++i;
}
NS_FATAL_ERROR("Address " << index << " not found");
Ipv4InterfaceAddress addr;
return addr; // quiet compiler
return {}; // quiet compiler
}
Ipv4InterfaceAddress
@@ -401,7 +397,7 @@ Ipv4Interface::RemoveAddress(Ipv4Address address)
return ifAddr;
}
}
return Ipv4InterfaceAddress();
return {};
}
void