From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 18 Dec 2012 23:32:11 +0000 (-0600)
Subject: [master] fix clang static analyzer issue
X-Git-Tag: bind10-1.0.0-beta-release~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddd815eb743887a54500fdd839e2de17571b1bf1;p=thirdparty%2Fkea.git

[master] fix clang static analyzer issue

Value stored to 'opt_len' during its initialization is never read

discussed via jabber

also use const
---

diff --git a/tests/tools/perfdhcp/pkt_transform.cc b/tests/tools/perfdhcp/pkt_transform.cc
index b1c64e2339..15f15f15f3 100644
--- a/tests/tools/perfdhcp/pkt_transform.cc
+++ b/tests/tools/perfdhcp/pkt_transform.cc
@@ -196,12 +196,10 @@ PktTransform::unpackOptions(const OptionBuffer& in_buffer,
 
         // Get option length which is supposed to be after option type.
         offset += offset_step;
-        uint16_t opt_len = in_buffer[offset] * 256 + in_buffer[offset + 1];
-        if (option->getUniverse() == Option::V6) {
-            opt_len = in_buffer[offset] * 256 + in_buffer[offset + 1];
-        } else {
-            opt_len = in_buffer[offset];
-        }
+        const uint16_t opt_len =
+            (option->getUniverse() == Option::V6) ?
+            in_buffer[offset] * 256 + in_buffer[offset + 1] :
+            in_buffer[offset];
 
         // Check if packet is not truncated.
         if (offset + option->getHeaderLen() + opt_len > in_buffer.size()) {