From ad8c901f58714fc91ea0fd16c994525398d5a912 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 5 Jun 2015 13:58:19 +0200 Subject: [PATCH] lib/async_req: s/result/req/ in async_connect_send() BUG: https://bugzilla.samba.org/show_bug.cgi?id=11316 Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke (cherry picked from commit be8c2ff10353df00f05cd378c251a33a9e08563a) --- lib/async_req/async_sock.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c index 531d779d6ea..13c58ffe8de 100644 --- a/lib/async_req/async_sock.c +++ b/lib/async_req/async_sock.c @@ -69,13 +69,12 @@ struct tevent_req *async_connect_send( void (*after_connect)(void *private_data), void *private_data) { - struct tevent_req *result; + struct tevent_req *req; struct async_connect_state *state; struct tevent_fd *fde; - result = tevent_req_create( - mem_ctx, &state, struct async_connect_state); - if (result == NULL) { + req = tevent_req_create(mem_ctx, &state, struct async_connect_state); + if (req == NULL) { return NULL; } @@ -115,7 +114,7 @@ struct tevent_req *async_connect_send( } if (state->result == 0) { - tevent_req_done(result); + tevent_req_done(req); goto done; } @@ -136,18 +135,18 @@ struct tevent_req *async_connect_send( } fde = tevent_add_fd(ev, state, fd, TEVENT_FD_READ | TEVENT_FD_WRITE, - async_connect_connected, result); + async_connect_connected, req); if (fde == NULL) { state->sys_errno = ENOMEM; goto post_errno; } - return result; + return req; post_errno: - tevent_req_error(result, state->sys_errno); + tevent_req_error(req, state->sys_errno); done: fcntl(fd, F_SETFL, state->old_sockflags); - return tevent_req_post(result, ev); + return tevent_req_post(req, ev); } /** -- 2.11.4.GIT