From: Volker Lendecke Date: Thu, 25 Aug 2022 08:31:42 +0000 (+0200) Subject: libsmb: Remove cli_full_connection_creds_sess_start() X-Git-Tag: talloc-2.4.0~1258 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3b2c2b5ef8657e8d43044a67af866e29ee94f2e;p=thirdparty%2Fsamba.git libsmb: Remove cli_full_connection_creds_sess_start() This contained very simple tevent_req logic, hiding that confused the code for me when reading. Also, this change saves 3 lines... Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index d894ef76a36..a49df948cad 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -3372,7 +3372,6 @@ static int cli_full_connection_creds_state_destructor( } static void cli_full_connection_creds_conn_done(struct tevent_req *subreq); -static void cli_full_connection_creds_sess_start(struct tevent_req *req); static void cli_full_connection_creds_sess_done(struct tevent_req *subreq); static void cli_full_connection_creds_enc_start(struct tevent_req *req); static void cli_full_connection_creds_enc_tcon(struct tevent_req *subreq); @@ -3452,15 +3451,6 @@ static void cli_full_connection_creds_conn_done(struct tevent_req *subreq) return; } - cli_full_connection_creds_sess_start(req); -} - -static void cli_full_connection_creds_sess_start(struct tevent_req *req) -{ - struct cli_full_connection_creds_state *state = tevent_req_data( - req, struct cli_full_connection_creds_state); - struct tevent_req *subreq = NULL; - subreq = cli_session_setup_creds_send( state, state->ev, state->cli, state->creds); if (tevent_req_nomem(subreq, req)) { @@ -3492,7 +3482,14 @@ static void cli_full_connection_creds_sess_done(struct tevent_req *subreq) return; } - cli_full_connection_creds_sess_start(req); + subreq = cli_session_setup_creds_send( + state, state->ev, state->cli, state->creds); + if (tevent_req_nomem(subreq, req)) { + return; + } + tevent_req_set_callback(subreq, + cli_full_connection_creds_sess_done, + req); return; }