]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Fix deadcode warning in get_interface_addresses_raw().
authorNick Mathewson <nickm@torproject.org>
Mon, 16 Feb 2015 20:28:33 +0000 (15:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 Feb 2015 20:28:36 +0000 (15:28 -0500)
CID  1268070

src/common/address.c

index d8202e17a549b1fe7c020f7f7428a37c958b15b3..42a116a91e0e455d09653c66a5d0f81041076aa0 100644 (file)
@@ -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.  */