diff options
| author | ume <ume@FreeBSD.org> | 2003-09-25 13:40:06 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2003-09-25 13:40:06 +0000 |
| commit | 99f18c28fc44a76bd422f2499e16f75cf58f887f (patch) | |
| tree | c2bab98921c4413df1ac1f9b14ab70b82483865f /sys/netkey | |
| parent | 888cc825c41917fc17ebf317df947b27c071b1c6 (diff) | |
| download | FreeBSD-src-99f18c28fc44a76bd422f2499e16f75cf58f887f.zip FreeBSD-src-99f18c28fc44a76bd422f2499e16f75cf58f887f.tar.gz | |
add /*CONSTCOND*/ to reduce diffs against latest KAME.
Obtained from: KAME
Diffstat (limited to 'sys/netkey')
| -rw-r--r-- | sys/netkey/key.c | 14 | ||||
| -rw-r--r-- | sys/netkey/key_debug.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/netkey/key.c b/sys/netkey/key.c index f325ead..ab63564 100644 --- a/sys/netkey/key.c +++ b/sys/netkey/key.c @@ -284,7 +284,7 @@ do {\ curelm = LIST_NEXT(curelm, field);\ LIST_INSERT_AFTER(curelm, elm, field);\ }\ -} while (0) +} while (/*CONSTCOND*/ 0) #define KEY_CHKSASTATE(head, sav, name) \ do { \ @@ -293,7 +293,7 @@ do { \ (name), (head), (sav))); \ continue; \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #define KEY_CHKSPDIR(head, sp, name) \ do { \ @@ -302,7 +302,7 @@ do { \ "anyway continue.\n", \ (name), (head), (sp))); \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #if 1 #define KMALLOC(p, t, n) \ @@ -315,13 +315,13 @@ do { \ ((p) = (t)malloc((unsigned long)(n), M_SECA, M_NOWAIT)); \ printf("%s %d: %p <- KMALLOC(%s, %d)\n", \ __FILE__, __LINE__, (p), #t, n); \ -} while (0) +} while (/*CONSTCOND*/ 0) #define KFREE(p) \ do { \ printf("%s %d: %p -> KFREE()\n", __FILE__, __LINE__, (p)); \ free((caddr_t)(p), M_SECA); \ - } while (0) + } while (/*CONSTCOND*/ 0) #endif /* @@ -337,7 +337,7 @@ do { \ (idx)->ul_proto = (ulp); \ bcopy((s), &(idx)->src, ((const struct sockaddr *)(s))->sa_len); \ bcopy((d), &(idx)->dst, ((const struct sockaddr *)(d))->sa_len); \ -} while (0) +} while (/*CONSTCOND*/ 0) /* * set parameters into secasindex buffer. @@ -351,7 +351,7 @@ do { \ (idx)->reqid = (r); \ bcopy((s), &(idx)->src, ((const struct sockaddr *)(s))->sa_len); \ bcopy((d), &(idx)->dst, ((const struct sockaddr *)(d))->sa_len); \ -} while (0) +} while (/*CONSTCOND*/ 0) /* key statistics */ struct _keystat { diff --git a/sys/netkey/key_debug.h b/sys/netkey/key_debug.h index 9284255..0bfdbba 100644 --- a/sys/netkey/key_debug.h +++ b/sys/netkey/key_debug.h @@ -54,7 +54,7 @@ #define KEYDEBUG_IPSEC_DUMP (KEYDEBUG_IPSEC | KEYDEBUG_DUMP) #define KEYDEBUG(lev,arg) \ - do { if ((key_debug_level & (lev)) == (lev)) { arg; } } while (0) + do { if ((key_debug_level & (lev)) == (lev)) { arg; } } while (/*CONSTCOND*/ 0) extern u_int32_t key_debug_level; #endif /*_KERNEL*/ |
