svn commit: r229132 - stable/7/sys/cam

[Matthew D Fleming]

Author: mdf
Date: Sat Dec 31 18:41:29 2011
New Revision: 229132
URL: http://svn.freebsd.org/changeset/base/229132

Log:
  MFC r228442:
  
  Do not use the sometimes-reserved word 'bool' for a variable name.
  This is a direct commit since the file name has changed.

Modified:
  stable/7/sys/cam/cam_xpt.c

Modified: stable/7/sys/cam/cam_xpt.c
==============================================================================
--- stable/7/sys/cam/cam_xpt.c	Sat Dec 31 18:09:31 2011	(r229131)
+++ stable/7/sys/cam/cam_xpt.c	Sat Dec 31 18:41:29 2011	(r229132)
@@ -6439,14 +6439,14 @@ xpt_find_quirk(struct cam_ed *device)
 static int
 sysctl_cam_search_luns(SYSCTL_HANDLER_ARGS)
 {
-	int error, bool;
+	int error, val;
 
-	bool = cam_srch_hi;
-	error = sysctl_handle_int(oidp, &bool, 0, req);
+	val = cam_srch_hi;
+	error = sysctl_handle_int(oidp, &val, 0, req);
 	if (error != 0 || req->newptr == NULL)
 		return (error);
-	if (bool == 0 || bool == 1) {
-		cam_srch_hi = bool;
+	if (val == 0 || val == 1) {
+		cam_srch_hi = val;
 		return (0);
 	} else {
 		return (EINVAL);