diff options
| -rw-r--r-- | sbin/route/show.c | 22 | ||||
| -rw-r--r-- | sbin/route/show.h | 8 |
2 files changed, 8 insertions, 22 deletions
diff --git a/sbin/route/show.c b/sbin/route/show.c index 6dfc05b8c32..d82943384aa 100644 --- a/sbin/route/show.c +++ b/sbin/route/show.c @@ -1,4 +1,4 @@ -/* $OpenBSD: show.c,v 1.41 2005/03/30 05:34:30 henning Exp $ */ +/* $OpenBSD: show.c,v 1.42 2005/03/30 05:40:55 henning Exp $ */ /* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */ /* @@ -30,14 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#if 0 -static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94"; -#else -static const char rcsid[] = "$OpenBSD: show.c,v 1.41 2005/03/30 05:34:30 henning Exp $"; -#endif -#endif /* not lint */ - #include <sys/param.h> #include <sys/protosw.h> #include <sys/socket.h> @@ -64,6 +56,12 @@ static const char rcsid[] = "$OpenBSD: show.c,v 1.41 2005/03/30 05:34:30 henning #include "show.h" +char *any_ntoa(const struct sockaddr *); +char *ipx_print(struct sockaddr *); +char *link_print(struct sockaddr *); + +extern int nflag; + #define PLEN (LONG_BIT / 4 + 2) /* XXX this is also defined in netstat.h */ #define ROUNDUP(a) \ @@ -242,15 +240,9 @@ pr_family(int af) case AF_INET6: afname = "Internet6"; break; - case AF_NS: - afname = "XNS"; - break; case AF_IPX: afname = "IPX"; break; - case AF_CCITT: - afname = "X.25"; - break; case PF_KEY: afname = "Encap"; break; diff --git a/sbin/route/show.h b/sbin/route/show.h index 5c6a30ffc5e..7b8d3f26f21 100644 --- a/sbin/route/show.h +++ b/sbin/route/show.h @@ -1,4 +1,4 @@ -/* $OpenBSD: show.h,v 1.3 2005/02/18 04:00:21 jaredy Exp $ */ +/* $OpenBSD: show.h,v 1.4 2005/03/30 05:40:55 henning Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -22,11 +22,5 @@ void p_rttables(int, int); char *routename(struct sockaddr *); char *netname(struct sockaddr *, struct sockaddr *); -char *any_ntoa(const struct sockaddr *); -char *ns_print(struct sockaddr *); -char *ipx_print(struct sockaddr *); -char *link_print(struct sockaddr *); - -extern int nflag; #endif /* __SHOW_H__ */ |