From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 Feb 2015 20:28:33 +0000 (-0500)
Subject: Fix deadcode warning in get_interface_addresses_raw().
X-Git-Tag: tor-0.2.6.3-alpha~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7117959199a230cc7f1684794b8b13235b5f2715;p=thirdparty%2Ftor.git

Fix deadcode warning in get_interface_addresses_raw().

CID  1268070
---

diff --git a/src/common/address.c b/src/common/address.c
index d8202e17a5..42a116a91e 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1470,18 +1470,21 @@ get_interface_addresses_ioctl(int severity)
 STATIC smartlist_t *
 get_interface_addresses_raw(int severity)
 {
+  smartlist_t *result = NULL;
 #if defined(HAVE_IFADDRS_TO_SMARTLIST)
-  return get_interface_addresses_ifaddrs(severity);
+  if ((result = get_interface_addresses_ifaddrs(severity)))
+    return result;
 #endif
 #if defined(HAVE_IP_ADAPTER_TO_SMARTLIST)
-  return get_interface_addresses_win32(severity);
+  if ((result = get_interface_addresses_win32(severity)))
+    return result;
 #endif
 #if defined(HAVE_IFCONF_TO_SMARTLIST)
-  return get_interface_addresses_ioctl(severity);
-#else
+  if ((result = get_interface_addresses_ioctl(severity)))
+    return result;
+#endif
   (void) severity;
   return NULL;
-#endif
 }
 
 /** Return true iff <b>a</b> is a multicast address.  */