svn commit: samba r13831 - in trunk/source/locking: .

[jra at samba.org]

Author: jra
Date: 2006-03-04 06:56:45 +0000 (Sat, 04 Mar 2006)
New Revision: 13831

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13831

Log:
Tidyup use of BOOL here.
Jeremy.

Modified:
   trunk/source/locking/locking.c


Changeset:
Modified: trunk/source/locking/locking.c
===================================================================
--- trunk/source/locking/locking.c	2006-03-04 00:16:51 UTC (rev 13830)
+++ trunk/source/locking/locking.c	2006-03-04 06:56:45 UTC (rev 13831)
@@ -81,24 +81,24 @@
 	int snum = SNUM(fsp->conn);
 	int strict_locking = lp_strict_locking(snum);
 	enum brl_flavour lock_flav = lp_posix_cifsu_locktype();
-	BOOL ret;
+	BOOL ret = True;
 	
 	if (count == 0) {
-		return(False);
+		return False;
 	}
 
 	if (!lp_locking(snum) || !strict_locking) {
-		return(False);
+		return False;
 	}
 
 	if (strict_locking == Auto) {
 		if  (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && (lock_type == READ_LOCK || lock_type == WRITE_LOCK)) {
 			DEBUG(10,("is_locked: optimisation - exclusive oplock on file %s\n", fsp->fsp_name ));
-			ret = 0;
+			ret = False;
 		} else if ((fsp->oplock_type == LEVEL_II_OPLOCK) &&
 			   (lock_type == READ_LOCK)) {
 			DEBUG(10,("is_locked: optimisation - level II oplock on file %s\n", fsp->fsp_name ));
-			ret = 0;
+			ret = False;
 		} else {
 			struct byte_range_lock *br_lck = brl_get_locks(NULL, fsp);
 			ret = !brl_locktest(br_lck,