Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/sysmon Separate the two conditions for the KASSERT, ...



details:   https://anonhg.NetBSD.org/src/rev/f3457e8703b2
branches:  trunk
changeset: 809188:f3457e8703b2
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Jun 23 19:22:56 2015 +0000

description:
Separate the two conditions for the KASSERT, so we can tell which
one occurred.

diffstat:

 sys/dev/sysmon/sysmon_envsys_events.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 79ab37ed4bb0 -r f3457e8703b2 sys/dev/sysmon/sysmon_envsys_events.c
--- a/sys/dev/sysmon/sysmon_envsys_events.c     Tue Jun 23 16:33:21 2015 +0000
+++ b/sys/dev/sysmon/sysmon_envsys_events.c     Tue Jun 23 19:22:56 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.116 2015/06/23 10:41:41 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.117 2015/06/23 19:22:56 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.116 2015/06/23 10:41:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.117 2015/06/23 19:22:56 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -768,7 +768,8 @@
        envsys_data_t *edata = see->see_edata;
 
        KASSERT(wk == &see->see_wk);
-       KASSERT(sme != NULL && edata != NULL);
+       KASSERT(sme != NULL);
+       KASSERT(edata != NULL);
 
        mutex_enter(&sme->sme_mtx);
        see->see_flags |= SEE_EVENT_WORKING;



Home | Main Index | Thread Index | Old Index