diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2004-11-17 01:47:21 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2004-11-17 01:47:21 +0000 |
| commit | ea9351ad6e7abe8037e67138103e038dc61cc8e2 (patch) | |
| tree | 12fa1b362bb119ac898e59e23e54c8eba193f553 /sbin | |
| parent | 9d1a0f394346489b403a0639926ffc2d04372f01 (diff) | |
remove NI_WITHSCOPEID (which is not standard)
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 12 | ||||
| -rw-r--r-- | sbin/route/show.c | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index dab801074a8..ffcbb083112 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.118 2004/11/06 00:54:19 reyk Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.119 2004/11/17 01:47:20 itojun Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -77,7 +77,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #else -static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.118 2004/11/06 00:54:19 reyk Exp $"; +static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.119 2004/11/17 01:47:20 itojun Exp $"; #endif #endif /* not lint */ @@ -1867,11 +1867,7 @@ phys_status(int force) char psrcaddr[NI_MAXHOST]; char pdstaddr[NI_MAXHOST]; const char *ver = ""; -#ifdef NI_WITHSCOPEID - const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID; -#else /* NI_WITHSCOPEID */ const int niflag = NI_NUMERICHOST; -#endif /* NI_WITHSCOPEID */ struct if_laddrreq req; psrcaddr[0] = pdstaddr[0] = '\0'; @@ -2132,11 +2128,7 @@ in6_alias(struct in6_ifreq *creq) struct in6_ifreq ifr6; /* shadows file static variable */ u_int32_t scopeid; char hbuf[NI_MAXHOST]; -#ifdef NI_WITHSCOPEID - const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID; -#else /* NI_WITHSCOPEID */ const int niflag = NI_NUMERICHOST; -#endif /* NI_WITHSCOPEID */ /* Get the non-alias address for this interface. */ getsock(AF_INET6); diff --git a/sbin/route/show.c b/sbin/route/show.c index 1b1973a98eb..b314f22a03a 100644 --- a/sbin/route/show.c +++ b/sbin/route/show.c @@ -1,4 +1,4 @@ -/* $OpenBSD: show.c,v 1.38 2004/10/14 15:20:56 jaredy Exp $ */ +/* $OpenBSD: show.c,v 1.39 2004/11/17 01:47:20 itojun Exp $ */ /* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94"; #else -static const char rcsid[] = "$OpenBSD: show.c,v 1.38 2004/10/14 15:20:56 jaredy Exp $"; +static const char rcsid[] = "$OpenBSD: show.c,v 1.39 2004/11/17 01:47:20 itojun Exp $"; #endif #endif /* not lint */ @@ -452,11 +452,7 @@ routename6(struct sockaddr_in6 *sin6) { int niflags; -#ifdef NI_WITHSCOPEID - niflags = NI_WITHSCOPEID; -#else niflags = 0; -#endif if (nflag) niflags |= NI_NUMERICHOST; else @@ -519,11 +515,7 @@ netname6(struct sockaddr_in6 *sa6, struct sockaddr_in6 *mask) int i, lim, flag, error; char hbuf[NI_MAXHOST]; -#ifdef NI_WITHSCOPEID - flag = NI_WITHSCOPEID; -#else flag = 0; -#endif sin6 = *sa6; |