[src/trunk]: src/sys/netinet KASSERT x then y, not x && y, to give more speci...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b3b2e229d3e
branches:  trunk
changeset: 337466:2b3b2e229d3e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Apr 15 13:02:16 2015 +0000

description:
KASSERT x then y, not x && y, to give more specific errors.

diffstat:

 sys/netinet/ip_encap.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 5ea0bac6dc92 -r 2b3b2e229d3e sys/netinet/ip_encap.c
--- a/sys/netinet/ip_encap.c    Wed Apr 15 12:11:31 2015 +0000
+++ b/sys/netinet/ip_encap.c    Wed Apr 15 13:02:16 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_encap.c,v 1.42 2015/04/15 08:47:28 ozaki-r Exp $    */
+/*     $NetBSD: ip_encap.c,v 1.43 2015/04/15 13:02:16 riastradh Exp $  */
 /*     $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $       */
 
 /*
@@ -75,7 +75,7 @@
 #define USE_RADIX
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.42 2015/04/15 08:47:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.43 2015/04/15 13:02:16 riastradh Exp $");
 
 #include "opt_mrouting.h"
 #include "opt_inet.h"
@@ -505,8 +505,10 @@
                if (ep->func)
                        continue;
 
-               KASSERT(ep->src != NULL && ep->dst != NULL &&
-                   ep->srcmask != NULL && ep->dstmask != NULL);
+               KASSERT(ep->src != NULL);
+               KASSERT(ep->dst != NULL);
+               KASSERT(ep->srcmask != NULL);
+               KASSERT(ep->dstmask != NULL);
 
                if (ep->src->sa_len != sp->sa_len ||
                    memcmp(ep->src, sp, sp->sa_len) != 0 ||