summaryrefslogtreecommitdiffstats
path: root/sys/kern/tty_snoop.c
diff options
context:
space:
mode:
authoreivind <eivind@FreeBSD.org>1999-01-08 17:31:30 +0000
committereivind <eivind@FreeBSD.org>1999-01-08 17:31:30 +0000
commita8dc66f457be84eefbe16e70c901ceb11137ba65 (patch)
treee5747f527c552fa90334c779c047697b372582fb /sys/kern/tty_snoop.c
parent1c69824749ed0aa6efce159d39ab3f17fc9e25f2 (diff)
downloadFreeBSD-src-a8dc66f457be84eefbe16e70c901ceb11137ba65.zip
FreeBSD-src-a8dc66f457be84eefbe16e70c901ceb11137ba65.tar.gz
Split DIAGNOSTIC -> DIAGNOSTIC, INVARIANTS, and INVARIANT_SUPPORT as
discussed on -hackers. Introduce 'KASSERT(assertion, ("panic message", args))' for simple check + panic. Reviewed by: msmith
Diffstat (limited to 'sys/kern/tty_snoop.c')
-rw-r--r--sys/kern/tty_snoop.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index c4b13e5..06f17dd 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -135,10 +135,8 @@ snpread(dev, uio, flag)
caddr_t from;
char *nbuf;
-#ifdef DIAGNOSTIC
- if ((snp->snp_len + snp->snp_base) > snp->snp_blen)
- panic("snoop buffer error");
-#endif
+ KASSERT(snp->snp_len + snp->snp_base <= snp->snp_blen,
+ ("snoop buffer error"));
if (snp->snp_tty == NULL)
return (EIO);
@@ -212,10 +210,9 @@ snpin(snp, buf, n)
if (n == 0)
return 0;
-#ifdef DIAGNOSTIC
- if (n < 0)
- panic("bad snoop char count");
+ KASSERT(n > 0, ("negative snoop char count"));
+#ifdef DIAGNOSTIC
if (!(snp->snp_flags & SNOOP_OPEN)) {
printf("Snoop: data coming to closed device.\n");
return 0;
OpenPOWER on IntegriCloud