This commit was generated by cvs2svn to compensate for changes in r123109,
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
commit
a66a98a597
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=123110
@ -443,7 +443,8 @@ char *getifname(ptr)
|
||||
void *ptr;
|
||||
{
|
||||
#if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
|
||||
defined(__OpenBSD__)
|
||||
defined(__OpenBSD__) || \
|
||||
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
|
||||
#else
|
||||
char buf[32], *s;
|
||||
int len;
|
||||
@ -458,7 +459,8 @@ void *ptr;
|
||||
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
|
||||
return "X";
|
||||
#if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
|
||||
defined(__OpenBSD__)
|
||||
defined(__OpenBSD__) || \
|
||||
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
|
||||
return strdup(netif.if_xname);
|
||||
#else
|
||||
if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
|
||||
|
@ -204,7 +204,8 @@ void *ptr;
|
||||
return ifname;
|
||||
#else
|
||||
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
|
||||
defined(__OpenBSD__)
|
||||
defined(__OpenBSD__) || \
|
||||
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
|
||||
#else
|
||||
char buf[32];
|
||||
int len;
|
||||
@ -219,7 +220,8 @@ void *ptr;
|
||||
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
|
||||
return "X";
|
||||
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
|
||||
defined(__OpenBSD__)
|
||||
defined(__OpenBSD__) || \
|
||||
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
|
||||
return strdup(netif.if_xname);
|
||||
# else
|
||||
if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
|
||||
|
Loading…
Reference in New Issue
Block a user