From: Volker Lendecke <vl@samba.org>
Date: Fri, 1 Jun 2012 13:21:12 +0000 (+0200)
Subject: s3: Slightly simplify close_remove_share_mode
X-Git-Tag: samba-4.0.0beta1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8541829a9ab20c7fa8c;p=thirdparty%2Fsamba.git

s3: Slightly simplify close_remove_share_mode

Remove a level of indentation by more use of "continue;"

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 3045990b980..e2d7c2c7a7b 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -421,17 +421,22 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 		   POSIX delete now. */
 		for (i=0; i<lck->data->num_share_modes; i++) {
 			struct share_mode_entry *e = &lck->data->share_modes[i];
-			if (is_valid_share_mode_entry(e) &&
-					e->name_hash == fsp->name_hash) {
-				if (fsp->posix_open && (e->flags & SHARE_MODE_FLAG_POSIX_OPEN)) {
-					continue;
-				}
-				if (share_mode_stale_pid(lck->data, i)) {
-					continue;
-				}
-				delete_file = False;
-				break;
+
+			if (!is_valid_share_mode_entry(e)) {
+				continue;
 			}
+			if (e->name_hash != fsp->name_hash) {
+				continue;
+			}
+			if (fsp->posix_open
+			    && (e->flags & SHARE_MODE_FLAG_POSIX_OPEN)) {
+				continue;
+			}
+			if (share_mode_stale_pid(lck->data, i)) {
+				continue;
+			}
+			delete_file = False;
+			break;
 		}
 	}