From f14f746227a3c7da8899d70d2a08445a484be6b5 Mon Sep 17 00:00:00 2001
From: "Peter D. Barnes, Jr." <barnes26@llnl.gov>
Date: Wed, 26 Jun 2013 17:15:56 -0700
Subject: [PATCH] [Coverity] Logically dead code (DEADCODE)

---
 src/network/model/nix-vector.cc      | 3 ++-
 src/network/model/packet-metadata.cc | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/network/model/nix-vector.cc b/src/network/model/nix-vector.cc
index 546a8642e..982cdbbfd 100644
--- a/src/network/model/nix-vector.cc
+++ b/src/network/model/nix-vector.cc
@@ -311,7 +311,8 @@ NixVector::Deserialize (const uint32_t* buffer, uint32_t size)
 
   // return zero if an entire nix-vector was 
   // not deserialized
-  return (sizeCheck != 0) ? 0 : 1;
+  // This check is obviated by prior assert
+  return 1;
 }
 
 void
diff --git a/src/network/model/packet-metadata.cc b/src/network/model/packet-metadata.cc
index 51f73fb92..a54dc93fa 100644
--- a/src/network/model/packet-metadata.cc
+++ b/src/network/model/packet-metadata.cc
@@ -1349,7 +1349,9 @@ PacketMetadata::Deserialize (const uint8_t* buffer, uint32_t size)
       UpdateTail (tmp);
     }
   NS_ASSERT (desSize == 0);
-  return (desSize !=0) ? 0 : 1;
+  // Return zero if entire meta data was not deserialized
+  // This check is obviated by prior assert
+  return 1;
 }
 
 uint8_t*