Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

1 files changed, 9 insertions, 25 deletions

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 1d5582e61d0..1ba93d827d1 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -278,15 +278,10 @@ struct async_req *cli_pull_send(TALLOC_CTX *mem_ctx,
 	struct cli_pull_state *state;
 	int i;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
-		goto failed;
-	}
-	state = talloc(result, struct cli_pull_state);
-	if (state == NULL) {
-		goto failed;
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct cli_pull_state)) {
+		return NULL;
 	}
-	result->private_data = state;
 	result->print = cli_pull_print;
 	state->req = result;
 
@@ -843,16 +838,10 @@ static struct async_req *cli_writeall_send(TALLOC_CTX *mem_ctx,
 	struct async_req *subreq;
 	struct cli_writeall_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
-		goto fail;
-	}
-	state = talloc(result, struct cli_writeall_state);
-	if (state == NULL) {
-		goto fail;
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct cli_writeall_state)) {
+		return NULL;
 	}
-	result->private_data = state;
-
 	state->ev = ev;
 	state->cli = cli;
 	state->fnum = fnum;
@@ -969,15 +958,10 @@ struct async_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
 	struct cli_push_state *state;
 	int i;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
-		goto failed;
-	}
-	state = talloc(result, struct cli_push_state);
-	if (state == NULL) {
-		goto failed;
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct cli_push_state)) {
+		return NULL;
 	}
-	result->private_data = state;
 	state->req = result;
 
 	state->cli = cli;