diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-01-11 05:12:41 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-01-11 05:12:41 +0000 |
commit | b3067fd524234e263e58b215d0fb24d414bf1c34 (patch) | |
tree | 5c1576265dded5700ab387af81051fabd39f3396 /sys/kern | |
parent | 9ee95b4b405b050512cf782b508d774f4601a6b5 (diff) |
panic prints a newline for you, don't do it in the panic string
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/exec_aout.c | 4 | ||||
-rw-r--r-- | sys/kern/exec_ecoff.c | 4 | ||||
-rw-r--r-- | sys/kern/exec_elf.c | 4 | ||||
-rw-r--r-- | sys/kern/exec_script.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_lock.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_malloc.c | 4 | ||||
-rw-r--r-- | sys/kern/subr_autoconf.c | 4 | ||||
-rw-r--r-- | sys/kern/subr_prf.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_cluster.c | 6 | ||||
-rw-r--r-- | sys/kern/vfs_lookup.c | 4 |
10 files changed, 21 insertions, 21 deletions
diff --git a/sys/kern/exec_aout.c b/sys/kern/exec_aout.c index 458f39e598a..61b37d86b00 100644 --- a/sys/kern/exec_aout.c +++ b/sys/kern/exec_aout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_aout.c,v 1.3 1996/12/23 02:42:41 deraadt Exp $ */ +/* $OpenBSD: exec_aout.c,v 1.4 1999/01/11 05:12:21 millert Exp $ */ /* $NetBSD: exec_aout.c,v 1.14 1996/02/04 02:15:01 christos Exp $ */ /* @@ -125,7 +125,7 @@ exec_aout_prep_zmagic(p, epp) epp->ep_vp->v_writecount != 0) { #ifdef DIAGNOSTIC if (epp->ep_vp->v_flag & VTEXT) - panic("exec: a VTEXT vnode has writecount != 0\n"); + panic("exec: a VTEXT vnode has writecount != 0"); #endif return ETXTBSY; } diff --git a/sys/kern/exec_ecoff.c b/sys/kern/exec_ecoff.c index 741fecea34d..d745255f729 100644 --- a/sys/kern/exec_ecoff.c +++ b/sys/kern/exec_ecoff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_ecoff.c,v 1.4 1996/12/23 02:42:42 deraadt Exp $ */ +/* $OpenBSD: exec_ecoff.c,v 1.5 1999/01/11 05:12:21 millert Exp $ */ /* $NetBSD: exec_ecoff.c,v 1.8 1996/05/19 20:36:06 jonathan Exp $ */ /* @@ -199,7 +199,7 @@ exec_ecoff_prep_zmagic(p, epp) epp->ep_vp->v_writecount != 0) { #ifdef DIAGNOSTIC if (epp->ep_vp->v_flag & VTEXT) - panic("exec: a VTEXT vnode has writecount != 0\n"); + panic("exec: a VTEXT vnode has writecount != 0"); #endif return ETXTBSY; } diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c index 75c425402e3..6cd23955660 100644 --- a/sys/kern/exec_elf.c +++ b/sys/kern/exec_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf.c,v 1.22 1998/07/28 00:13:02 millert Exp $ */ +/* $OpenBSD: exec_elf.c,v 1.23 1999/01/11 05:12:22 millert Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -471,7 +471,7 @@ exec_elf_makecmds(p, epp) if (epp->ep_vp->v_writecount != 0) { #ifdef DIAGNOSTIC if (epp->ep_vp->v_flag & VTEXT) - panic("exec: a VTEXT vnode has writecount != 0\n"); + panic("exec: a VTEXT vnode has writecount != 0"); #endif return (ETXTBSY); } diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c index 93583be73d5..7f7c90a72cc 100644 --- a/sys/kern/exec_script.c +++ b/sys/kern/exec_script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_script.c,v 1.7 1997/11/06 05:58:13 csapuntz Exp $ */ +/* $OpenBSD: exec_script.c,v 1.8 1999/01/11 05:12:22 millert Exp $ */ /* $NetBSD: exec_script.c,v 1.13 1996/02/04 02:15:06 christos Exp $ */ /* @@ -207,7 +207,7 @@ check_shell: (size_t *)0); #ifdef DIAGNOSTIC if (error != 0) - panic("exec_script: copyinstr couldn't fail\n"); + panic("exec_script: copyinstr couldn't fail"); #endif #ifdef FDSCRIPTS } else diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index c8cdb419973..2f157288837 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_lock.c,v 1.7 1998/12/28 19:13:04 art Exp $ */ +/* $OpenBSD: kern_lock.c,v 1.8 1999/01/11 05:12:22 millert Exp $ */ /* * Copyright (c) 1995 @@ -199,7 +199,7 @@ lockmgr(lkp, flags, interlkp, p) panic("lockmgr: using decommissioned lock"); if ((flags & LK_TYPE_MASK) != LK_RELEASE || lkp->lk_lockholder != pid) - panic("lockmgr: non-release on draining lock: %d\n", + panic("lockmgr: non-release on draining lock: %d", flags & LK_TYPE_MASK); lkp->lk_flags &= ~LK_DRAINING; if ((flags & LK_REENABLE) == 0) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 8b3b6fa155b..ce8f043dcf3 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.9 1998/02/20 13:43:23 niklas Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.10 1999/01/11 05:12:23 millert Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -300,7 +300,7 @@ free(addr, type) else alloc = addrmask[kup->ku_indx]; if (((u_long)addr & alloc) != 0) - panic("free: unaligned addr %p, size %ld, type %s, mask %ld\n", + panic("free: unaligned addr %p, size %ld, type %s, mask %ld", addr, size, memname[type], alloc); #endif /* DIAGNOSTIC */ if (size > MAXALLOCSAVE) { diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 20565ac06a0..c7b5c014a44 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_autoconf.c,v 1.21 1998/05/11 09:59:39 niklas Exp $ */ +/* $OpenBSD: subr_autoconf.c,v 1.22 1999/01/11 05:12:23 millert Exp $ */ /* $NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $ */ /* @@ -147,7 +147,7 @@ mapply(m, cf) pri = (*m->fn)(m->parent, match, m->aux); else { if (cf->cf_attach->ca_match == NULL) { - panic("mapply: no match function for '%s' device\n", + panic("mapply: no match function for '%s' device", cf->cf_driver->cd_name); } pri = (*cf->cf_attach->ca_match)(m->parent, match, m->aux); diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 4f1fab02321..c97f513d8ce 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prf.c,v 1.24 1999/01/10 01:45:31 niklas Exp $ */ +/* $OpenBSD: subr_prf.c,v 1.25 1999/01/11 05:12:23 millert Exp $ */ /* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */ /*- @@ -137,7 +137,7 @@ __assert(t, f, l, e) int l; { - panic("kernel %sassertion \"%s\" failed: file \"%s\", line %d\n", + panic("kernel %sassertion \"%s\" failed: file \"%s\", line %d", t, e, f, l); } diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 05e6d6e210b..bb6de8a9b56 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_cluster.c,v 1.15 1998/10/13 00:28:32 csapuntz Exp $ */ +/* $OpenBSD: vfs_cluster.c,v 1.16 1999/01/11 05:12:24 millert Exp $ */ /* $NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $ */ /*- @@ -292,7 +292,7 @@ cluster_rbuild(vp, filesize, bp, lbn, blkno, size, run, flags) #ifdef DIAGNOSTIC if (size != vp->v_mount->mnt_stat.f_iosize) - panic("cluster_rbuild: size %ld != filesize %ld\n", + panic("cluster_rbuild: size %ld != filesize %ld", size, vp->v_mount->mnt_stat.f_iosize); #endif if ((u_quad_t)size * (u_quad_t)(lbn + run + 1) > filesize) @@ -612,7 +612,7 @@ cluster_wbuild(vp, last_bp, size, start_lbn, len, lbn) #ifdef DIAGNOSTIC if (size != vp->v_mount->mnt_stat.f_iosize) - panic("cluster_wbuild: size %ld != filesize %ld\n", + panic("cluster_wbuild: size %ld != filesize %ld", size, vp->v_mount->mnt_stat.f_iosize); #endif redo: diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 765d12444c1..fce0bd94090 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_lookup.c,v 1.15 1998/08/07 01:56:11 csapuntz Exp $ */ +/* $OpenBSD: vfs_lookup.c,v 1.16 1999/01/11 05:12:24 millert Exp $ */ /* $NetBSD: vfs_lookup.c,v 1.17 1996/02/09 19:00:59 christos Exp $ */ /* @@ -694,7 +694,7 @@ relookup(dvp, vpp, cnp) * Check for symbolic link */ if (dp->v_type == VLNK && (cnp->cn_flags & FOLLOW)) - panic ("relookup: symlink found.\n"); + panic ("relookup: symlink found."); #endif /* |