diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2003-09-25 13:40:06 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2003-09-25 13:40:06 +0000 |
| commit | 5c6ebad8f63d023470328f0fcb015900537c1bfe (patch) | |
| tree | c2bab98921c4413df1ac1f9b14ab70b82483865f | |
| parent | 4bcf9f8e6f5d6f5f81b948458913596de0162944 (diff) | |
Notes
| -rw-r--r-- | sys/netinet/icmp6.h | 6 | ||||
| -rw-r--r-- | sys/netinet/ip6.h | 6 | ||||
| -rw-r--r-- | sys/netkey/key.c | 14 | ||||
| -rw-r--r-- | sys/netkey/key_debug.h | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index 374c67efa078..3154c09bdd9a 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -515,7 +515,7 @@ do { \ p = (u_char *)filterp; \ for (i = 0; i < sizeof(struct icmp6_filter); i++) \ p[i] = 0xff; \ -} while (0) +} while (/*CONSTCOND*/ 0) #define ICMP6_FILTER_SETBLOCKALL(filterp) \ bzero(filterp, sizeof(struct icmp6_filter)) #else /* _KERNEL */ @@ -678,7 +678,7 @@ do { \ && icmp6_ifstat && icmp6_ifstat[(ifp)->if_index]) { \ icmp6_ifstat[(ifp)->if_index]->tag++; \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #define icmp6_ifoutstat_inc(ifp, type, code) \ do { \ @@ -731,7 +731,7 @@ do { \ icmp6_ifstat_inc(ifp, ifs6_out_redirect); \ break; \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) extern int icmp6_rediraccept; /* accept/process redirects */ extern int icmp6_redirtimeout; /* cache time for redirect routes */ diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h index fe441d8197f6..e8dc1567caf6 100644 --- a/sys/netinet/ip6.h +++ b/sys/netinet/ip6.h @@ -255,7 +255,7 @@ do { \ return ret; \ } \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) /* * IP6_EXTHDR_GET ensures that intermediate protocol header (from "off" to @@ -284,7 +284,7 @@ do { \ (m) = NULL; \ } \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #define IP6_EXTHDR_GET0(val, typ, m, off, len) \ do { \ @@ -302,7 +302,7 @@ do { \ (m) = NULL; \ } \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #endif /*_KERNEL*/ #endif /* not _NETINET_IP6_H_ */ diff --git a/sys/netkey/key.c b/sys/netkey/key.c index f325eade055f..ab635646d066 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 9284255767f5..0bfdbba884a3 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*/ |