Author: rwatson
Date: Wed Feb 25 13:47:09 2009
New Revision: 189039
URL: http://svn.freebsd.org/changeset/base/189039
Log:
Merge r188122 from head to stable/7:
Eliminate the local variable 'ape' in audit_pipe_kqread(), as it's only
used for an assertion that we don't really need anymore.
Reported by: Christoph Mallon <christoph dot mallon at gmx dot de>
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/security/audit/audit_pipe.c
Modified: stable/7/sys/security/audit/audit_pipe.c
==============================================================================
--- stable/7/sys/security/audit/audit_pipe.c Wed Feb 25 13:42:38 2009
(r189038)
+++ stable/7/sys/security/audit/audit_pipe.c Wed Feb 25 13:47:09 2009
(r189039)
@@ -1076,18 +1076,13 @@ audit_pipe_kqfilter(struct cdev *dev, st
static int
audit_pipe_kqread(struct knote *kn, long hint)
{
- struct audit_pipe_entry *ape;
struct audit_pipe *ap;
ap = (struct audit_pipe *)kn->kn_hook;
KASSERT(ap != NULL, ("audit_pipe_kqread: ap == NULL"));
-
AUDIT_PIPE_LOCK_ASSERT(ap);
if (ap->ap_qlen != 0) {
- ape = TAILQ_FIRST(&ap->ap_queue);
- KASSERT(ape != NULL, ("audit_pipe_kqread: ape == NULL"));
-
kn->kn_data = ap->ap_qbyteslen - ap->ap_qoffset;
return (1);
} else {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
