From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 4 Jun 2013 15:34:16 +0000 (+0200)
Subject: [2987] Changes as a result of the review.
X-Git-Tag: bind10-1.2.0beta1-release~424^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98bcbd53342827be7a5be66f8ba69f7e37559c2c;p=thirdparty%2Fkea.git

[2987] Changes as a result of the review.
---

diff --git a/src/lib/dhcp/tests/pkt_filter_inet_unittest.cc b/src/lib/dhcp/tests/pkt_filter_inet_unittest.cc
index 5607103ce4..eaf2e62ef2 100644
--- a/src/lib/dhcp/tests/pkt_filter_inet_unittest.cc
+++ b/src/lib/dhcp/tests/pkt_filter_inet_unittest.cc
@@ -40,16 +40,13 @@ public:
 
     /// @brief Constructor
     ///
-    /// This constructor initializes socket_ member to the value of 0.
+    /// This constructor initializes socket_ member to a negative value.
     /// Explcit initialization is performed here because some of the
     /// tests do not initialize this value. In such cases, destructor
     /// could invoke close() on uninitialized socket descriptor which
-    /// would result in errors being reported by Valgrind. Note that
-    /// by initializing the class member to a valid socket descriptor
-    /// value (non-negative) we avoid Valgrind warning about trying to
-    /// close the invalid socket descriptor.
+    /// would result in errors being reported by Valgrind.
     PktFilterInetTest()
-        : socket_(0) {
+        : socket_(-1) {
         // Initialize ifname_ and ifindex_.
         loInit();
     }
@@ -60,7 +57,9 @@ public:
     ~PktFilterInetTest() {
         // Cleanup after each test. This guarantees
         // that the socket does not hang after a test.
-        close(socket_);
+        if (socket_ >= 0) {
+            close(socket_);
+        }
     }
 
     /// @brief Detect loopback interface.
diff --git a/src/lib/dhcp/tests/pkt_filter_lpf_unittest.cc b/src/lib/dhcp/tests/pkt_filter_lpf_unittest.cc
index 4587bd54ce..742a7c98c3 100644
--- a/src/lib/dhcp/tests/pkt_filter_lpf_unittest.cc
+++ b/src/lib/dhcp/tests/pkt_filter_lpf_unittest.cc
@@ -44,16 +44,13 @@ public:
 
     /// @brief Constructor
     ///
-    /// This constructor initializes socket_ member to the value of 0.
+    /// This constructor initializes socket_ member to a negative value.
     /// Explcit initialization is performed here because some of the
     /// tests do not initialize this value. In such cases, destructor
     /// could invoke close() on uninitialized socket descriptor which
-    /// would result in errors being reported by Valgrind. Note that
-    /// by initializing the class member to a valid socket descriptor
-    /// value (non-negative) we avoid Valgrind warning about trying to
-    /// close the invalid socket descriptor.
+    /// would result in errors being reported by Valgrind.
     PktFilterLPFTest()
-        : socket_(0) {
+        : socket_(-1) {
         // Initialize ifname_ and ifindex_.
         loInit();
     }
@@ -64,7 +61,9 @@ public:
     ~PktFilterLPFTest() {
         // Cleanup after each test. This guarantees
         // that the socket does not hang after a test.
-        close(socket_);
+        if (socket_ >= 0) {
+            close(socket_);
+        }
     }
 
     /// @brief Detect loopback interface.