On Sunday, July 07, 2013 5:39:37 pm Alfred Perlstein wrote: > Author: alfred > Date: Sun Jul 7 21:39:37 2013 > New Revision: 253007 > URL: http://svnweb.freebsd.org/changeset/base/253007 > > Log: > Make kassert_printf use __printflike. > > Fix associated errors/warnings while I'm here. > > Requested by: avg > > Modified: > head/sys/kern/subr_witness.c > head/sys/kern/vfs_bio.c > head/sys/net80211/ieee80211_output.c > head/sys/sys/systm.h > > Modified: head/sys/kern/subr_witness.c > ============================================================================== > --- head/sys/kern/subr_witness.c Sun Jul 7 21:23:58 2013 > (r253006) > +++ head/sys/kern/subr_witness.c Sun Jul 7 21:39:37 2013 > (r253007) > @@ -1138,12 +1138,16 @@ witness_checkorder(struct lock_object *l > 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);
Eh, this isn't really correct. Better to remove the useless "exclusive"/"shared" string argument. That was a copy/paste bug on my part. -- John Baldwin _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
