just merged cosmetic changes from KAME to ease sync between KAME and FreeBSD.

(based on freebsd4-snap-20020128)

Reviewed by:	ume
MFC after:	1 week

6 files changed, 22 insertions, 11 deletions

diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 9c56af4..9ef8898 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -1,5 +1,5 @@
 .\"	$FreeBSD$
-.\"	$KAME: getaddrinfo.3,v 1.22 2000/08/09 21:16:17 itojun Exp $
+.\"	$KAME: getaddrinfo.3,v 1.31 2001/08/05 18:19:38 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -573,6 +573,7 @@ indicate an unknown error.
 .Xr getnameinfo 3 ,
 .Xr getservbyname 3 ,
 .Xr hosts 5 ,
+.Xr resolv.conf 5 ,
 .Xr services 5 ,
 .Xr hostname 7 ,
 .Xr named 8
diff --git a/lib/libc/net/ifname.c b/lib/libc/net/ifname.c
index d383038..e6e5a77 100644
--- a/lib/libc/net/ifname.c
+++ b/lib/libc/net/ifname.c
@@ -1,3 +1,5 @@
+/*	$KAME: ifname.c,v 1.4 2001/08/20 02:32:40 itojun Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
diff --git a/lib/libc/net/inet_addr.c b/lib/libc/net/inet_addr.c
index b305524..eb97f84 100644
--- a/lib/libc/net/inet_addr.c
+++ b/lib/libc/net/inet_addr.c
@@ -1,3 +1,5 @@
+/*	$KAME: inet_addr.c,v 1.5 2001/08/20 02:32:40 itojun Exp $	*/
+
 /*
  * ++Copyright++ 1983, 1990, 1993
  * -
diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c
index d4cb90b..05bb1f4 100644
--- a/lib/libc/net/inet_pton.c
+++ b/lib/libc/net/inet_pton.c
@@ -1,3 +1,5 @@
+/*	$KAME: inet_pton.c,v 1.5 2001/08/20 02:32:40 itojun Exp $	*/
+
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index da906b2..abfe34a 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -1,3 +1,5 @@
+/*	$KAME: rthdr.c,v 1.8 2001/08/20 02:32:40 itojun Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -226,9 +228,9 @@ inet6_rthdr_segments(cmsg)
 }
 
 struct in6_addr *
-inet6_rthdr_getaddr(cmsg, index)
+inet6_rthdr_getaddr(cmsg, idx)
     struct cmsghdr *cmsg;
-    int index;
+    int idx;
 {
     struct ip6_rthdr *rthdr;
 
@@ -248,13 +250,13 @@ inet6_rthdr_getaddr(cmsg, index)
 	    return NULL;
 	}
 	naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-	if (index <= 0 || naddr < index) {
+	if (idx <= 0 || naddr < idx) {
 #ifdef DEBUG
-	    fprintf(stderr, "inet6_rthdr_getaddr: invalid index(%d)\n", index);
+	    fprintf(stderr, "inet6_rthdr_getaddr: invalid idx(%d)\n", idx);
 #endif 
 	    return NULL;
 	}
-	return &rt0->ip6r0_addr[index - 1];
+	return &rt0->ip6r0_addr[idx - 1];
       }
 
     default:
@@ -267,9 +269,9 @@ inet6_rthdr_getaddr(cmsg, index)
 }
 
 int
-inet6_rthdr_getflags(cmsg, index)
+inet6_rthdr_getflags(cmsg, idx)
     const struct cmsghdr *cmsg;
-    int index;
+    int idx;
 {
     struct ip6_rthdr *rthdr;
 
@@ -289,13 +291,13 @@ inet6_rthdr_getflags(cmsg, index)
 	    return -1;
 	}
 	naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-	if (index < 0 || naddr < index) {
+	if (idx < 0 || naddr < idx) {
 #ifdef DEBUG
-	    fprintf(stderr, "inet6_rthdr_getflags: invalid index(%d)\n", index);
+	    fprintf(stderr, "inet6_rthdr_getflags: invalid idx(%d)\n", idx);
 #endif 
 	    return -1;
 	}
-	if (rt0->ip6r0_slmap[index / 8] & (0x80 >> (index % 8)))
+	if (rt0->ip6r0_slmap[idx / 8] & (0x80 >> (idx % 8)))
 	    return IPV6_RTHDR_STRICT;
 	else
 	    return IPV6_RTHDR_LOOSE;
diff --git a/lib/libc/net/vars.c b/lib/libc/net/vars.c
index 72b47c8..42ee205 100644
--- a/lib/libc/net/vars.c
+++ b/lib/libc/net/vars.c
@@ -1,3 +1,5 @@
+/*	$KAME: vars.c,v 1.2 2001/08/20 02:32:41 itojun Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.