]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Avoid a few else branches in smb2_query_directory_next_entry()
authorVolker Lendecke <vl@samba.org>
Sat, 27 May 2023 11:07:08 +0000 (13:07 +0200)
committerJeremy Allison <jra@samba.org>
Tue, 13 Jun 2023 23:33:39 +0000 (23:33 +0000)
There's early returns or gotos anyway

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/smb2_query_directory.c

index 5c02d0fe2814c52a678dbdbb82b8fbfed8227d28..3ac152a96dd7d9cdfd08c111c07b87276a910e0e 100644 (file)
@@ -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 &&