Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src move ipsec_{hex,bin}dump() into #ifdef wrapper.



details:   https://anonhg.NetBSD.org/src/rev/43b61978ad59
branches:  trunk
changeset: 494227:43b61978ad59
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Jul 04 04:41:54 2000 +0000

description:
move ipsec_{hex,bin}dump() into #ifdef wrapper.
libipsec: remove unnecessary #include key_debug.h.

diffstat:

 lib/libipsec/policy_token.l |   5 ++---
 sys/netkey/key_debug.c      |   7 +++----
 sys/netkey/key_debug.h      |  11 +++++------
 3 files changed, 10 insertions(+), 13 deletions(-)

diffs (73 lines):

diff -r 27cdf4055e41 -r 43b61978ad59 lib/libipsec/policy_token.l
--- a/lib/libipsec/policy_token.l       Tue Jul 04 04:18:17 2000 +0000
+++ b/lib/libipsec/policy_token.l       Tue Jul 04 04:41:54 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: policy_token.l,v 1.4 2000/06/12 10:40:52 itojun Exp $  */
-/*     $KAME: policy_token.l,v 1.9 2000/05/07 05:25:03 itojun Exp $    */
+/*     $NetBSD: policy_token.l,v 1.5 2000/07/04 04:41:55 itojun Exp $  */
+/*     $KAME: policy_token.l,v 1.10 2000/07/04 04:03:33 itojun Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -37,7 +37,6 @@
 #include <net/route.h>
 #include <net/pfkeyv2.h>
 #include <netkey/keydb.h>
-#include <netkey/key_debug.h>
 #include <netinet/in.h>
 #include <netinet6/ipsec.h>
 
diff -r 27cdf4055e41 -r 43b61978ad59 sys/netkey/key_debug.c
--- a/sys/netkey/key_debug.c    Tue Jul 04 04:18:17 2000 +0000
+++ b/sys/netkey/key_debug.c    Tue Jul 04 04:41:54 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: key_debug.c,v 1.12 2000/07/01 01:01:36 itojun Exp $    */
-/*     $KAME: key_debug.c,v 1.22 2000/06/22 08:38:34 sakane Exp $      */
+/*     $NetBSD: key_debug.c,v 1.13 2000/07/04 04:41:54 itojun Exp $    */
+/*     $KAME: key_debug.c,v 1.23 2000/07/04 04:08:15 itojun Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -706,8 +706,6 @@
        return;
 }
 
-#endif /* !defined(_KERNEL) || (defined(_KERNEL) && defined(IPSEC_DEBUG)) */
-
 void
 ipsec_bindump(buf, len)
        caddr_t buf;
@@ -741,3 +739,4 @@
        return;
 }
 
+#endif /* !defined(_KERNEL) || (defined(_KERNEL) && defined(IPSEC_DEBUG)) */
diff -r 27cdf4055e41 -r 43b61978ad59 sys/netkey/key_debug.h
--- a/sys/netkey/key_debug.h    Tue Jul 04 04:18:17 2000 +0000
+++ b/sys/netkey/key_debug.h    Tue Jul 04 04:41:54 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: key_debug.h,v 1.6 2000/06/12 10:40:48 itojun Exp $     */
-/*     $KAME: key_debug.h,v 1.6 2000/03/27 05:11:05 sumikawa Exp $     */
+/*     $NetBSD: key_debug.h,v 1.7 2000/07/04 04:41:54 itojun Exp $     */
+/*     $KAME: key_debug.h,v 1.7 2000/07/04 04:08:16 itojun Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -83,14 +83,13 @@
 struct sockaddr;
 extern void kdebug_sockaddr __P((struct sockaddr *));
 
+extern void ipsec_hexdump __P((caddr_t, int));
+extern void ipsec_bindump __P((caddr_t, int));
+
 #else
 
 #define KEYDEBUG(lev,arg)
 
 #endif /*!defined(_KERNEL) || (defined(_KERNEL) && defined(IPSEC_DEBUG))*/
 
-extern void ipsec_hexdump __P((caddr_t, int));
-extern void ipsec_bindump __P((caddr_t, int));
-
 #endif /* _NETKEY_KEY_DEBUG_H_ */
-



Home | Main Index | Thread Index | Old Index