[Coverity] Structurally dead code (UNREACHABLE)
authorPeter D. Barnes, Jr. <barnes26@llnl.gov>
Wed, 15 May 2013 14:45:28 -0400
changeset 9782 ed82eb2702d0
parent 9781 53881f164b2b
child 9783 828a38d9c799
[Coverity] Structurally dead code (UNREACHABLE)
src/dsr/model/dsr-options.cc
src/dsr/model/dsr-rreq-table.cc
src/wifi/model/wifi-information-element-vector.cc
src/wifi/model/wifi-mac-header.cc
src/wimax/model/simple-ofdm-wimax-phy.cc
--- a/src/dsr/model/dsr-options.cc	Wed May 15 14:00:06 2013 -0400
+++ b/src/dsr/model/dsr-options.cc	Wed May 15 14:45:28 2013 -0400
@@ -939,7 +939,7 @@
           return rreq.GetSerializedSize ();
         }
     }
-  return rreq.GetSerializedSize ();
+  //unreachable:  return rreq.GetSerializedSize ();
 }
 
 NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep);
--- a/src/dsr/model/dsr-rreq-table.cc	Wed May 15 14:00:06 2013 -0400
+++ b/src/dsr/model/dsr-rreq-table.cc	Wed May 15 14:45:28 2013 -0400
@@ -225,7 +225,7 @@
 RreqTable::MarkLinkAsUnidirectional (Ipv4Address neighbor, Time blacklistTimeout)
 {
   NS_LOG_LOGIC ("Add neighbor address in blacklist " << m_blackList.size ());
-  for (std::vector<BlackList>::iterator i = m_blackList.begin (); i != m_blackList.end (); ++i)
+  for (std::vector<BlackList>::iterator i = m_blackList.begin (); i != m_blackList.end (); i++)
     {
       if (i->m_neighborAddress == neighbor)
         {
--- a/src/wifi/model/wifi-information-element-vector.cc	Wed May 15 14:00:06 2013 -0400
+++ b/src/wifi/model/wifi-information-element-vector.cc	Wed May 15 14:45:28 2013 -0400
@@ -82,7 +82,9 @@
 {
   Buffer::Iterator i = start;
   uint8_t id = i.ReadU8 ();
-  uint8_t length = i.ReadU8 ();
+  //unused: uint8_t length = i.ReadU8 ();
+  //but need side effects of read:
+  i.ReadU8 ();  
   Ptr<WifiInformationElement> newElement;
   switch (id)
     {
@@ -90,6 +92,7 @@
       NS_FATAL_ERROR ("Information element " << (uint16_t) id << " is not implemented");
       return 0;
     }
+  /*  unreachable:
   if (GetSize () + length > m_maxSize)
     {
       NS_FATAL_ERROR ("Check max size for information element!");
@@ -98,6 +101,7 @@
   i.Next (length);
   m_elements.push_back (newElement);
   return i.GetDistanceFrom (start);
+  */
 }
 void
 WifiInformationElementVector::Print (std::ostream & os) const
--- a/src/wifi/model/wifi-mac-header.cc	Wed May 15 14:00:06 2013 -0400
+++ b/src/wifi/model/wifi-mac-header.cc	Wed May 15 14:45:28 2013 -0400
@@ -881,9 +881,11 @@
 const char *
 WifiMacHeader::GetTypeString (void) const
 {
+  std::string typeString;
+  
 #define FOO(x) \
 case WIFI_MAC_ ## x: \
-  return # x; \
+  typeString = # x; \
   break;
 
   switch (GetType ())
@@ -927,8 +929,7 @@
       return "ERROR";
     }
 #undef FOO
-  // needed to make gcc 4.0.1 ppc darwin happy.
-  return "BIG_ERROR";
+  return typeString.c_str ();
 }
 
 TypeId
--- a/src/wimax/model/simple-ofdm-wimax-phy.cc	Wed May 15 14:00:06 2013 -0400
+++ b/src/wimax/model/simple-ofdm-wimax-phy.cc	Wed May 15 14:45:28 2013 -0400
@@ -820,51 +820,51 @@
 {
   uint16_t duration = 0;
   duration = (uint16_t)(GetFrameDuration ().GetSeconds () * 10000);
+  uint8_t retval = 0;
   switch (duration)
     {
     case 25:
       {
-        return FRAME_DURATION_2_POINT_5_MS;
+        retval = FRAME_DURATION_2_POINT_5_MS;
         break;
       }
     case 40:
       {
-        return FRAME_DURATION_4_MS;
+        retval = FRAME_DURATION_4_MS;
         break;
       }
     case 50:
       {
-        return FRAME_DURATION_5_MS;
+        retval = FRAME_DURATION_5_MS;
         break;
       }
     case 80:
       {
-        return FRAME_DURATION_8_MS;
+        retval = FRAME_DURATION_8_MS;
         break;
       }
     case 100:
       {
-        return FRAME_DURATION_10_MS;
+        retval = FRAME_DURATION_10_MS;
         break;
       }
     case 125:
       {
-        return FRAME_DURATION_12_POINT_5_MS;
+        retval = FRAME_DURATION_12_POINT_5_MS;
         break;
       }
     case 200:
       {
-        return FRAME_DURATION_20_MS;
+        retval = FRAME_DURATION_20_MS;
         break;
       }
     default:
       {
         NS_FATAL_ERROR ("Invalid frame duration = " << duration);
-        return 0;
+        retval = 0;
       }
     }
-  NS_FATAL_ERROR ("Invalid frame duration = " << duration);
-  return 0;
+  return retval;
 }
 
 Time