From 553226e8e16639b00d61d81e0125330dbfb7eed8 Mon Sep 17 00:00:00 2001
From: suz <suz@FreeBSD.org>
Date: Fri, 19 Apr 2002 04:46:24 +0000
Subject: 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
---
 sys/netkey/key.h       | 2 +-
 sys/netkey/key_debug.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sys/netkey')

diff --git a/sys/netkey/key.h b/sys/netkey/key.h
index ed03ba4..4cbe358 100644
--- a/sys/netkey/key.h
+++ b/sys/netkey/key.h
@@ -1,5 +1,5 @@
 /*	$FreeBSD$	*/
-/*	$KAME: key.h,v 1.20 2001/03/22 08:09:32 itojun Exp $	*/
+/*	$KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c
index 8e7c5d9..25dcce3 100644
--- a/sys/netkey/key_debug.c
+++ b/sys/netkey/key_debug.c
@@ -678,7 +678,7 @@ void
 kdebug_sockaddr(addr)
 	struct sockaddr *addr;
 {
-	struct sockaddr_in *sin;
+	struct sockaddr_in *sin4;
 #ifdef INET6
 	struct sockaddr_in6 *sin6;
 #endif
@@ -692,9 +692,9 @@ kdebug_sockaddr(addr)
 
 	switch (addr->sa_family) {
 	case AF_INET:
-		sin = (struct sockaddr_in *)addr;
-		printf(" port=%u\n", ntohs(sin->sin_port));
-		ipsec_hexdump((caddr_t)&sin->sin_addr, sizeof(sin->sin_addr));
+		sin4 = (struct sockaddr_in *)addr;
+		printf(" port=%u\n", ntohs(sin4->sin_port));
+		ipsec_hexdump((caddr_t)&sin4->sin_addr, sizeof(sin4->sin_addr));
 		break;
 #ifdef INET6
 	case AF_INET6:
-- 
cgit v1.1