From 6dbd2fb858eef78a8522841e2d999435113017d6 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Wed, 30 Sep 2020 08:26:22 +0000 Subject: [PATCH] ipfilter getifname ifdef cleanup. MFC after: 2 months --- contrib/ipfilter/lib/getifname.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/contrib/ipfilter/lib/getifname.c b/contrib/ipfilter/lib/getifname.c index 44b4f8b53899..518950acd1a2 100644 --- a/contrib/ipfilter/lib/getifname.c +++ b/contrib/ipfilter/lib/getifname.c @@ -19,11 +19,9 @@ char *getifname(ptr) struct ifnet *ptr; { -#if SOLARIS || defined(__hpux) -# if SOLARIS +#if SOLARIS # include # include -# endif # include "../pfil/qif.h" char *ifname; qif_t qif; @@ -42,13 +40,6 @@ char *getifname(ptr) } return ifname; #else -# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) -#else - char buf[LIFNAMSIZ]; - int len; -# endif struct ifnet netif; if ((void *)ptr == (void *)-1) @@ -58,24 +49,6 @@ char *getifname(ptr) if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) return "X"; -# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) || defined(linux) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return strdup(netif.if_xname); -# else - if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) - return "X"; - if (netif.if_unit < 10) - len = 2; - else if (netif.if_unit < 1000) - len = 3; - else if (netif.if_unit < 10000) - len = 4; - else - len = 5; - buf[sizeof(buf) - len] = '\0'; - sprintf(buf + strlen(buf), "%d", netif.if_unit % 10000); - return strdup(buf); -# endif #endif }