diff options
author | alfred <alfred@FreeBSD.org> | 2013-07-07 21:39:37 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2013-07-07 21:39:37 +0000 |
commit | 89aac2b3a13c12edc057e517be17889ed45226dc (patch) | |
tree | 009ef8c32b76491687028e68bfebc3caa722c2ad /sys/kern/subr_witness.c | |
parent | 229a41531c64f7fcc574b62e2bf82452b5170b93 (diff) | |
download | FreeBSD-src-89aac2b3a13c12edc057e517be17889ed45226dc.zip FreeBSD-src-89aac2b3a13c12edc057e517be17889ed45226dc.tar.gz |
Make kassert_printf use __printflike.
Fix associated errors/warnings while I'm here.
Requested by: avg
Diffstat (limited to 'sys/kern/subr_witness.c')
-rw-r--r-- | sys/kern/subr_witness.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index bf28a88..3b4d7a2 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -1138,12 +1138,16 @@ witness_checkorder(struct lock_object *lock, int flags, const char *file, iclass = LOCK_CLASS(interlock); lock1 = find_instance(lock_list, interlock); if (lock1 == NULL) - kassert_panic("interlock (%s) %s not locked @ %s:%d", + kassert_panic( + "interlock (%s) %s not locked while locking" + " %s @ %s:%d", iclass->lc_name, interlock->lo_name, flags & LOP_EXCLUSIVE ? "exclusive" : "shared", fixup_filename(file), line); else if ((lock1->li_flags & LI_RECURSEMASK) != 0) - kassert_panic("interlock (%s) %s recursed @ %s:%d", + kassert_panic( + "interlock (%s) %s recursed while locking %s" + " @ %s:%d", iclass->lc_name, interlock->lo_name, flags & LOP_EXCLUSIVE ? "exclusive" : "shared", fixup_filename(file), line); |