Browse Source

Fix deadcode warning in get_interface_addresses_raw().

CID  1268070
Nick Mathewson 9 years ago
parent
commit
7117959199
1 changed files with 8 additions and 5 deletions
  1. 8 5
      src/common/address.c

+ 8 - 5
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.  */