From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Date: Thu, 22 Dec 2011 10:11:39 +0000 (-0200)
Subject: PC-Lint warnings fixed:
X-Git-Tag: v1.3~26
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=6947812ad2d9d6060ee64725fdcfa40603fba3a7;p=pingcheck

PC-Lint warnings fixed:
- Warning 1551: Function may throw exception '...' in destructor 'NetworkInterfaceList::~NetworkInterfaceList(void)';
- Info 774: Boolean within 'if' always evaluates to True.
---

diff --git a/src/host/networkinterfacelist.cpp b/src/host/networkinterfacelist.cpp
index f3015ab..4eb33b1 100644
--- a/src/host/networkinterfacelist.cpp
+++ b/src/host/networkinterfacelist.cpp
@@ -24,7 +24,10 @@
 
 #include <boost/assert.hpp>
 
+#include <logfunc.hpp>
+
 using namespace std;
+using I2n::Logger::GlobalLogger;
 
 //-----------------------------------------------------------------------------
 // NetworkInterfaceList
@@ -78,18 +81,15 @@ const struct ifaddrs * NetworkInterfaceList::find_interface(
     const ifaddrs_t *ifa_current = IfaFirst;
     while ( ifa_current != NULL )
     {
-        if ( ifa_current->ifa_addr->sa_data != NULL )
-        {
-            const char *nic_name_current = ifa_current->ifa_name;
-            bool name_match = ( nic_name == nic_name_current );
+        const char *nic_name_current = ifa_current->ifa_name;
+        bool name_match = ( nic_name == nic_name_current );
 
-            const sa_family_t family_current = ifa_current->ifa_addr->sa_family;
-            bool family_match = ( family == family_current );
+        const sa_family_t family_current = ifa_current->ifa_addr->sa_family;
+        bool family_match = ( family == family_current );
 
-            if ( name_match && family_match )
-            {
-                return ifa_current;
-            }
+        if ( name_match && family_match )
+        {
+            return ifa_current;
         }
 
         ifa_current = ifa_current->ifa_next;
@@ -131,9 +131,16 @@ void NetworkInterfaceList::destroy_list()
 {
     BOOST_ASSERT( IfaFirst != NULL );
 
-    // The freeifaddrs() must release the linked list allocated by getifaddrs()
-    freeifaddrs( IfaFirst );
-    IfaFirst = NULL;
+    try {
+        // The freeifaddrs() must release the linked list allocated by getifaddrs()
+        freeifaddrs( IfaFirst );
+        IfaFirst = NULL;
+    }
+    catch ( ... )
+    {
+        GlobalLogger.error() << "Error: could not destroy network interface list."
+                << endl;
+    }
 }