From: Volker Lendecke <vl@samba.org>
Date: Sat, 27 May 2023 11:07:08 +0000 (+0200)
Subject: smbd: Avoid a few else branches in smb2_query_directory_next_entry()
X-Git-Tag: talloc-2.4.1~426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4c669c1cc47b28ead2b15d8c7d2928518cf876a;p=thirdparty%2Fsamba.git

smbd: Avoid a few else branches in smb2_query_directory_next_entry()

There's early returns or gotos anyway

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
index 5c02d0fe281..3ac152a96dd 100644
--- a/source3/smbd/smb2_query_directory.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -588,15 +588,19 @@ static bool smb2_query_directory_next_entry(struct tevent_req *req)
 			 * entry.
 			 */
 			return false;
-		} else if (state->num > 0) {
+		}
+
+		if (state->num > 0) {
 			goto last_entry_done;
-		} else if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
+		}
+
+		if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
 			tevent_req_nterror(req, NT_STATUS_INFO_LENGTH_MISMATCH);
 			return true;
-		} else {
-			tevent_req_nterror(req, state->empty_status);
-			return true;
 		}
+
+		tevent_req_nterror(req, state->empty_status);
+		return true;
 	}
 
 	if (state->async_ask_sharemode &&