Module Name: src
Committed By: maya
Date: Fri Nov 3 17:57:58 UTC 2017
Modified Files:
src/sys/dev/wscons: wsemul_sun.c wsemul_vt100.c
Log Message:
Don't #ifdef DIAGNOSTIC around KASSERTs.
the definition of KASSERT does the same thing
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/wscons/wsemul_sun.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/wscons/wsemul_vt100.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsemul_sun.c
diff -u src/sys/dev/wscons/wsemul_sun.c:1.30 src/sys/dev/wscons/wsemul_sun.c:1.31
--- src/sys/dev/wscons/wsemul_sun.c:1.30 Fri May 19 19:22:33 2017
+++ src/sys/dev/wscons/wsemul_sun.c Fri Nov 3 17:57:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_sun.c,v 1.30 2017/05/19 19:22:33 macallan Exp $ */
+/* $NetBSD: wsemul_sun.c,v 1.31 2017/11/03 17:57:58 maya Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -33,7 +33,7 @@
/* XXX DESCRIPTION/SOURCE OF INFORMATION */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.30 2017/05/19 19:22:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.31 2017/11/03 17:57:58 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,9 +176,7 @@ wsemul_sun_attach(int console, const str
if (console) {
edp = &wsemul_sun_console_emuldata;
-#ifdef DIAGNOSTIC
KASSERT(edp->console == 1);
-#endif
} else {
edp = malloc(sizeof *edp, M_DEVBUF, M_WAITOK);
Index: src/sys/dev/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.38 src/sys/dev/wscons/wsemul_vt100.c:1.39
--- src/sys/dev/wscons/wsemul_vt100.c:1.38 Fri May 19 19:22:33 2017
+++ src/sys/dev/wscons/wsemul_vt100.c Fri Nov 3 17:57:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.38 2017/05/19 19:22:33 macallan Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.39 2017/11/03 17:57:58 maya Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.38 2017/05/19 19:22:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.39 2017/11/03 17:57:58 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_wsmsgattrs.h"
@@ -242,9 +242,7 @@ wsemul_vt100_attach(int console, const s
if (console) {
edp = &wsemul_vt100_console_emuldata;
-#ifdef DIAGNOSTIC
KASSERT(edp->console == 1);
-#endif
} else {
edp = malloc(sizeof *edp, M_DEVBUF, M_WAITOK);
wsemul_vt100_init(edp, type, cookie, ccol, crow, defattr);
