From owner-svn-src-all@FreeBSD.ORG  Sat Dec 31 18:41:30 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 62B091065672;
	Sat, 31 Dec 2011 18:41:30 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 495E48FC1C;
	Sat, 31 Dec 2011 18:41:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBVIfUju077425;
	Sat, 31 Dec 2011 18:41:30 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBVIfUsl077423;
	Sat, 31 Dec 2011 18:41:30 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201112311841.pBVIfUsl077423@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Sat, 31 Dec 2011 18:41:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229132 - stable/7/sys/cam
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Dec 2011 18:41:30 -0000

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);