Author: rwatson
Date: Fri Feb 6 11:03:51 2009
New Revision: 188222
URL: http://svn.freebsd.org/changeset/base/188222
Log:
Merge r184904 from head to stable/7:
The audit queue limit variables are size_t, so use size_t for the audit
queue length variables as well, avoiding storing the limit in a larger
type than the length.
Submitted by: sson
Sponsored by: Apple Inc.
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.c
stable/7/sys/security/audit/audit_private.h
Modified: stable/7/sys/security/audit/audit.c
==============================================================================
--- stable/7/sys/security/audit/audit.c Fri Feb 6 10:30:46 2009
(r188221)
+++ stable/7/sys/security/audit/audit.c Fri Feb 6 11:03:51 2009
(r188222)
@@ -129,8 +129,8 @@ struct mtx audit_mtx;
* outstanding in the system.
*/
struct kaudit_queue audit_q;
-int audit_q_len;
-int audit_pre_q_len;
+size_t audit_q_len;
+size_t audit_pre_q_len;
/*
* Audit queue control settings (minimum free, low/high water marks, etc.)
Modified: stable/7/sys/security/audit/audit_private.h
==============================================================================
--- stable/7/sys/security/audit/audit_private.h Fri Feb 6 10:30:46 2009
(r188221)
+++ stable/7/sys/security/audit/audit_private.h Fri Feb 6 11:03:51 2009
(r188222)
@@ -274,8 +274,8 @@ extern struct mtx audit_mtx;
extern struct cv audit_watermark_cv;
extern struct cv audit_worker_cv;
extern struct kaudit_queue audit_q;
-extern int audit_q_len;
-extern int audit_pre_q_len;
+extern size_t audit_q_len;
+extern size_t audit_pre_q_len;
extern int audit_in_failure;
/*
_______________________________________________
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"
