From e3d077542f433f9e640717ff387c152630d351bf Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Sun, 5 Aug 2001 22:20:44 +0000
Subject: [PATCH] cosmetic (spacing near /* */).  sync with kame

---
 sys/netinet6/ipsec.c | 32 ++++++++++++++++----------------
 sys/netinet6/ipsec.h |  6 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index 65a9257a4daf..3f1dc194d14d 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec.c,v 1.35 2001/07/07 14:45:46 itojun Exp $	*/
+/*	$NetBSD: ipsec.c,v 1.36 2001/08/05 22:20:44 itojun Exp $	*/
 /*	$KAME: ipsec.c,v 1.102 2001/04/14 16:38:59 itojun Exp $	*/
 
 /*
@@ -1052,7 +1052,7 @@ ipsec_init_policy(so, pcb_sp)
 	}
 	bzero(new, sizeof(*new));
 
-	if (so->so_uid == 0)	/*XXX*/
+	if (so->so_uid == 0)	/* XXX */
 		new->priv = 1;
 	else
 		new->priv = 0;
@@ -1766,7 +1766,7 @@ ipsec_hdrsiz(sp)
 #ifdef IPSEC_ESP
 			clen = esp_hdrsiz(isr);
 #else
-			clen = 0;	/*XXX*/
+			clen = 0;	/* XXX */
 #endif
 			break;
 		case IPPROTO_AH:
@@ -1877,7 +1877,7 @@ ipsec6_hdrsiz(m, dir, in6p)
 
 	return size;
 }
-#endif /*INET6*/
+#endif /* INET6 */
 
 #ifdef INET
 /*
@@ -1973,13 +1973,13 @@ ipsec4_encapsulate(m, sav)
 	ip->ip_off &= htons(~IP_OFFMASK);
 	ip->ip_off &= htons(~IP_MF);
 	switch (ip4_ipsec_dfbit) {
-	case 0:	/*clear DF bit*/
+	case 0:	/* clear DF bit */
 		ip->ip_off &= htons(~IP_DF);
 		break;
-	case 1:	/*set DF bit*/
+	case 1:	/* set DF bit */
 		ip->ip_off |= htons(IP_DF);
 		break;
-	default:	/*copy DF bit*/
+	default:	/* copy DF bit */
 		break;
 	}
 	ip->ip_p = IPPROTO_IPIP;
@@ -2000,7 +2000,7 @@ ipsec4_encapsulate(m, sav)
 
 	return 0;
 }
-#endif /*INET*/
+#endif /* INET */
 
 #ifdef INET6
 static int
@@ -2080,7 +2080,7 @@ ipsec6_encapsulate(m, sav)
 
 	return 0;
 }
-#endif /*INET6*/
+#endif /* INET6 */
 
 /*
  * Check the variable replay window.
@@ -2325,7 +2325,7 @@ ipsec6_logpacketstr(ip6, spi)
 
 	return buf;
 }
-#endif /*INET6*/
+#endif /* INET6 */
 
 const char *
 ipsec_logsastr(sav)
@@ -2770,7 +2770,7 @@ ipsec6_output_trans(state, nexthdrp, mprev, sp, flags, tun)
 			ipseclog((LOG_ERR, "ipsec6_output_trans: "
 			    "IPsec with IPv6 jumbogram is not supported\n"));
 			ipsec6stat.out_inval++;
-			error = EINVAL;	/*XXX*/
+			error = EINVAL;	/* XXX */
 			goto bad;
 		}
 		ip6 = mtod(state->m, struct ip6_hdr *);
@@ -2826,7 +2826,7 @@ ipsec6_output_tunnel(state, sp, flags)
 			break;
 	}
 
-	for (/*already initialized*/; isr; isr = isr->next) {
+	for (/* already initialized */; isr; isr = isr->next) {
 		/* When tunnel mode, SA peers must be specified. */
 		bcopy(&isr->saidx, &saidx, sizeof(saidx));
 		if (key_checkrequest(isr, &saidx) == ENOENT) {
@@ -2952,7 +2952,7 @@ ipsec6_output_tunnel(state, sp, flags)
 			break;
 		case IPPROTO_IPCOMP:
 			/* XXX code should be here */
-			/*FALLTHROUGH*/
+			/* FALLTHROUGH */
 		default:
 			ipseclog((LOG_ERR, "ipsec6_output_tunnel: "
 			    "unknown ipsec protocol %d\n", isr->saidx.proto));
@@ -2970,7 +2970,7 @@ ipsec6_output_tunnel(state, sp, flags)
 			ipseclog((LOG_ERR, "ipsec6_output_tunnel: "
 			    "IPsec with IPv6 jumbogram is not supported\n"));
 			ipsec6stat.out_inval++;
-			error = EINVAL;	/*XXX*/
+			error = EINVAL;	/* XXX */
 			goto bad;
 		}
 		ip6 = mtod(state->m, struct ip6_hdr *);
@@ -2984,7 +2984,7 @@ bad:
 	state->m = NULL;
 	return error;
 }
-#endif /*INET6*/
+#endif /* INET6 */
 
 #ifdef INET
 /*
@@ -3351,7 +3351,7 @@ ipsec_addhist(m, proto, spi)
 	if (!n)
 		return ENOBUFS;
 	if (M_TRAILINGSPACE(n) < sizeof(*p))
-		return ENOSPC;	/*XXX*/
+		return ENOSPC;	/* XXX */
 	p = (struct ipsec_history *)(mtod(n, caddr_t) + n->m_len);
 	n->m_len += sizeof(*p);
 	bzero(p, sizeof(*p));
diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h
index ebf8ffe82a31..ccbe4c1866ef 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec.h,v 1.20 2001/05/30 12:04:54 mrg Exp $	*/
+/*	$NetBSD: ipsec.h,v 1.21 2001/08/05 22:20:44 itojun Exp $	*/
 /*	$KAME: ipsec.h,v 1.41 2001/01/23 04:42:30 itojun Exp $	*/
 
 /*
@@ -212,7 +212,7 @@ struct ipsecstat {
 #define IPSECCTL_DEF_ESP_NETLEV		4	/* int; ESP tunnel mode */
 #define IPSECCTL_DEF_AH_TRANSLEV	5	/* int; AH transport mode */
 #define IPSECCTL_DEF_AH_NETLEV		6	/* int; AH tunnel mode */
-#if 0	/*obsolete, do not reuse*/
+#if 0	/* obsolete, do not reuse */
 #define IPSECCTL_INBOUND_CALL_IKE	7
 #endif
 #define	IPSECCTL_AH_CLEARTOS		8
@@ -303,7 +303,7 @@ extern struct secpolicy *ipsec6_getpolicybysock
 	__P((struct mbuf *, u_int, struct socket *, int *));
 extern struct secpolicy *ipsec6_getpolicybyaddr
 	__P((struct mbuf *, u_int, int, int *));
-#endif /*INET6*/
+#endif /* INET6 */
 
 struct inpcb;
 #ifdef INET6