From 8541829a9ab20c7fa8c892490284c31593eb2fb8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 1 Jun 2012 15:21:12 +0200 Subject: s3: Slightly simplify close_remove_share_mode Remove a level of indentation by more use of "continue;" Signed-off-by: Stefan Metzmacher --- source3/smbd/close.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'source3') 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; idata->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; } } -- cgit