فهرست منبع

Remove all references to __no_netlink_support as after thurough scrutiny of
the code it was never used in any useful way.

Ricard Wanderlof 17 سال پیش
والد
کامیت
d403c9f150
2فایلهای تغییر یافته به همراه1 افزوده شده و 23 حذف شده
  1. 1 13
      libc/inet/ifaddrs.c
  2. 0 10
      libc/inet/netlinkaccess.h

+ 1 - 13
libc/inet/ifaddrs.c

@@ -308,9 +308,6 @@ __netlink_open (struct netlink_handle *h)
     close_and_out:
       __netlink_close (h);
     out:
-#if __ASSUME_NETLINK_SUPPORT == 0
-      __no_netlink_support = 1;
-#endif
       return -1;
     }
   /* Determine the ID the kernel assigned for this netlink connection.
@@ -374,18 +371,11 @@ getifaddrs (struct ifaddrs **ifap)
   if (ifap)
     *ifap = NULL;
 
-  if (! __no_netlink_support && __netlink_open (&nh) < 0)
+  if (__netlink_open (&nh) < 0)
     {
-#if __ASSUME_NETLINK_SUPPORT != 0
       return -1;
-#endif
     }
 
-#if __ASSUME_NETLINK_SUPPORT == 0
-  if (__no_netlink_support)
-    return fallback_getifaddrs (ifap);
-#endif
-
   /* Tell the kernel that we wish to get a list of all
      active interfaces, collect all data for every interface.  */
   if (__netlink_request (&nh, RTM_GETLINK) < 0)
@@ -864,13 +854,11 @@ getifaddrs (struct ifaddrs **ifap)
 }
 
 
-#if __ASSUME_NETLINK_SUPPORT != 0
 void
 freeifaddrs (struct ifaddrs *ifa)
 {
   free (ifa);
 }
-#endif
 
 #endif /* __UCLIBC_SUPPORT_AI_ADDRCONFIG__ */
 

+ 0 - 10
libc/inet/netlinkaccess.h

@@ -57,16 +57,6 @@ struct netlink_handle
 #define __ASSUME_NETLINK_SUPPORT 1
 #endif
 
-#ifdef __UCLIBC_SUPPORT_AI_ADDRCONFIG__
-#if __ASSUME_NETLINK_SUPPORT == 0
-/* suspicious: This will simply not work.. */
-extern smallint __no_netlink_support attribute_hidden;
-#else
-# define __no_netlink_support 0
-#endif
-#endif /* __UCLIBC_SUPPORT_AI_ADDRCONFIG__ */
-
-
 extern int __netlink_open (struct netlink_handle *h) attribute_hidden;
 extern void __netlink_close (struct netlink_handle *h) attribute_hidden;
 extern void __netlink_free_handle (struct netlink_handle *h) attribute_hidden;