Revert [Coverity] Logically dead code (DEADCODE)
authorPeter D. Barnes, Jr. <barnes26@llnl.gov>
Mon, 01 Jul 2013 10:08:20 -0700
changeset 9885 8a5d8ce1fab2
parent 9883 1226e64fab5a (current diff)
parent 9884 fe5b5a93860d (diff)
child 9886 243b172140ca
child 9890 3c64a1fbfcf9
Revert [Coverity] Logically dead code (DEADCODE) NS_ASSERT vanishes in optimized builds, so return code check still needed.
--- a/src/network/model/nix-vector.cc	Mon Jul 01 09:59:24 2013 -0700
+++ b/src/network/model/nix-vector.cc	Mon Jul 01 10:08:20 2013 -0700
@@ -311,8 +311,7 @@
 
   // return zero if an entire nix-vector was 
   // not deserialized
-  // This check is obviated by prior assert
-  return 1;
+  return (sizeCheck != 0) ? 0 : 1;
 }
 
 void
--- a/src/network/model/packet-metadata.cc	Mon Jul 01 09:59:24 2013 -0700
+++ b/src/network/model/packet-metadata.cc	Mon Jul 01 10:08:20 2013 -0700
@@ -1349,9 +1349,7 @@
       UpdateTail (tmp);
     }
   NS_ASSERT (desSize == 0);
-  // Return zero if entire meta data was not deserialized
-  // This check is obviated by prior assert
-  return 1;
+  return (desSize !=0) ? 0 : 1;
 }
 
 uint8_t*