From 2e95b77c993045cb448d36240ea38b44b5418c7e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 1 Jun 2012 16:13:22 +0200 Subject: s3: Make close_remove_share_mode a bit more readable by introducing a variable simplifying a boolean expression Signed-off-by: Stefan Metzmacher --- source3/smbd/close.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source3/smbd/close.c') diff --git a/source3/smbd/close.c b/source3/smbd/close.c index e2d7c2c7a7..d3232aae4f 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; } -- cgit