From: Volker Lendecke <vl@samba.org>
Date: Fri, 1 Jun 2012 14:13:22 +0000 (+0200)
Subject: s3: Make close_remove_share_mode a bit more readable
X-Git-Tag: samba-4.0.0beta1~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e95b77c993045cb448d36240ea38b44b5418c7e;p=thirdparty%2Fsamba.git

s3: Make close_remove_share_mode a bit more readable

by introducing a variable simplifying a boolean expression

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

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index e2d7c2c7a7b..d3232aae4f7 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -341,6 +341,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 	const struct security_unix_token *del_token = NULL;
 	const struct security_token *del_nt_token = NULL;
 	bool got_tokens = false;
+	bool normal_close;
 
 	/* Ensure any pending write time updates are done. */
 	if (fsp->update_write_time_event) {
@@ -449,8 +450,9 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 	 * reference to a file.
 	 */
 
-	if (!(close_type == NORMAL_CLOSE || close_type == SHUTDOWN_CLOSE) ||
-			!delete_file) {
+	normal_close = (close_type == NORMAL_CLOSE || close_type == SHUTDOWN_CLOSE);
+
+	if (!normal_close || !delete_file) {
 		TALLOC_FREE(lck);
 		return NT_STATUS_OK;
 	}