From 1ae0d7ea22f43b44a862af09001cff97cd0d4e58 Mon Sep 17 00:00:00 2001
From: Eduardo Almeida <enmsa@outlook.pt>
Date: Sun, 17 Sep 2023 22:10:09 +0000
Subject: [PATCH] Fix clang-tidy warnings (detected by clang-tidy-18)

---
 src/click/model/ipv4-click-routing.cc        |  2 +-
 src/internet/helper/internet-trace-helper.cc | 12 ++++--------
 src/internet/model/tcp-header.cc             |  2 +-
 src/mobility/helper/ns2-mobility-helper.cc   |  2 +-
 src/visualizer/model/pyviz.cc                |  2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc
index cf75df828..09cae2c3b 100644
--- a/src/click/model/ipv4-click-routing.cc
+++ b/src/click/model/ipv4-click-routing.cc
@@ -86,7 +86,7 @@ Ipv4ClickRouting::DoInitialize()
         m_nodeName = name.str();
     }
 
-    NS_ASSERT(m_clickFile.length() > 0);
+    NS_ASSERT(!m_clickFile.empty());
 
     // Even though simclick_click_create() will halt programme execution
     // if it is unable to initialise a Click router, we play safe
diff --git a/src/internet/helper/internet-trace-helper.cc b/src/internet/helper/internet-trace-helper.cc
index d461fcbc1..4e63373a9 100644
--- a/src/internet/helper/internet-trace-helper.cc
+++ b/src/internet/helper/internet-trace-helper.cc
@@ -59,8 +59,7 @@ PcapHelperForIpv4::EnablePcapIpv4(std::string prefix, Ipv4InterfaceContainer c)
 {
     for (Ipv4InterfaceContainer::Iterator i = c.Begin(); i != c.End(); ++i)
     {
-        std::pair<Ptr<Ipv4>, uint32_t> pair = *i;
-        EnablePcapIpv4(prefix, pair.first, pair.second, false);
+        EnablePcapIpv4(prefix, (*i).first, (*i).second, false);
     }
 }
 
@@ -200,8 +199,7 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl(Ptr<OutputStreamWrapper> stream,
 {
     for (Ipv4InterfaceContainer::Iterator i = c.Begin(); i != c.End(); ++i)
     {
-        std::pair<Ptr<Ipv4>, uint32_t> pair = *i;
-        EnableAsciiIpv4Internal(stream, prefix, pair.first, pair.second, false);
+        EnableAsciiIpv4Internal(stream, prefix, (*i).first, (*i).second, false);
     }
 }
 
@@ -341,8 +339,7 @@ PcapHelperForIpv6::EnablePcapIpv6(std::string prefix, Ipv6InterfaceContainer c)
 {
     for (Ipv6InterfaceContainer::Iterator i = c.Begin(); i != c.End(); ++i)
     {
-        std::pair<Ptr<Ipv6>, uint32_t> pair = *i;
-        EnablePcapIpv6(prefix, pair.first, pair.second, false);
+        EnablePcapIpv6(prefix, (*i).first, (*i).second, false);
     }
 }
 
@@ -482,8 +479,7 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl(Ptr<OutputStreamWrapper> stream,
 {
     for (Ipv6InterfaceContainer::Iterator i = c.Begin(); i != c.End(); ++i)
     {
-        std::pair<Ptr<Ipv6>, uint32_t> pair = *i;
-        EnableAsciiIpv6Internal(stream, prefix, pair.first, pair.second, false);
+        EnableAsciiIpv6Internal(stream, prefix, (*i).first, (*i).second, false);
     }
 }
 
diff --git a/src/internet/model/tcp-header.cc b/src/internet/model/tcp-header.cc
index cc3b7f7da..83fdc58e4 100644
--- a/src/internet/model/tcp-header.cc
+++ b/src/internet/model/tcp-header.cc
@@ -44,7 +44,7 @@ TcpHeader::FlagsToString(uint8_t flags, const std::string& delimiter)
     {
         if (flags & (1 << i))
         {
-            if (flagsDescription.length() > 0)
+            if (!flagsDescription.empty())
             {
                 flagsDescription += delimiter;
             }
diff --git a/src/mobility/helper/ns2-mobility-helper.cc b/src/mobility/helper/ns2-mobility-helper.cc
index 9a0fe0f88..790a662f8 100644
--- a/src/mobility/helper/ns2-mobility-helper.cc
+++ b/src/mobility/helper/ns2-mobility-helper.cc
@@ -523,7 +523,7 @@ ParseNs2Line(const std::string& str)
     {
         std::string x;
         s >> x;
-        if (x.length() == 0)
+        if (x.empty())
         {
             continue;
         }
diff --git a/src/visualizer/model/pyviz.cc b/src/visualizer/model/pyviz.cc
index 632d005ab..c45ff806c 100644
--- a/src/visualizer/model/pyviz.cc
+++ b/src/visualizer/model/pyviz.cc
@@ -51,7 +51,7 @@ PathSplit(std::string str)
         }
         str = str.substr(cutAt + 1);
     }
-    if (str.length() > 0)
+    if (!str.empty())
     {
         results.push_back(str);
     }