Convert rpc_cli_transport->write to tevent_req

1 files changed, 21 insertions, 20 deletions

diff --git a/source3/rpc_client/rpc_transport_np.c b/source3/rpc_client/rpc_transport_np.c
index 7da4421329..620910060a 100644
--- a/source3/rpc_client/rpc_transport_np.c
+++ b/source3/rpc_client/rpc_transport_np.c
@@ -51,18 +51,19 @@ struct rpc_np_write_state {
 
 static void rpc_np_write_done(struct async_req *subreq);
 
-static struct async_req *rpc_np_write_send(TALLOC_CTX *mem_ctx,
-					   struct event_context *ev,
-					   const uint8_t *data, size_t size,
-					   void *priv)
+static struct tevent_req *rpc_np_write_send(TALLOC_CTX *mem_ctx,
+					    struct event_context *ev,
+					    const uint8_t *data, size_t size,
+					    void *priv)
 {
 	struct rpc_transport_np_state *np_transport = talloc_get_type_abort(
 		priv, struct rpc_transport_np_state);
-	struct async_req *result, *subreq;
+	struct tevent_req *req;
+	struct async_req *subreq;
 	struct rpc_np_write_state *state;
 
-	if (!async_req_setup(mem_ctx, &result, &state,
-			     struct rpc_np_write_state)) {
+	req = tevent_req_create(mem_ctx, &state, struct rpc_np_write_state);
+	if (req == NULL) {
 		return NULL;
 	}
 	state->size = size;
@@ -75,37 +76,37 @@ static struct async_req *rpc_np_write_send(TALLOC_CTX *mem_ctx,
 		goto fail;
 	}
 	subreq->async.fn = rpc_np_write_done;
-	subreq->async.priv = result;
-	return result;
+	subreq->async.priv = req;
+	return req;
  fail:
-	TALLOC_FREE(result);
+	TALLOC_FREE(req);
 	return NULL;
 }
 
 static void rpc_np_write_done(struct async_req *subreq)
 {
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
-	struct rpc_np_write_state *state = talloc_get_type_abort(
-		req->private_data, struct rpc_np_write_state);
+	struct tevent_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct tevent_req);
+	struct rpc_np_write_state *state = tevent_req_data(
+		req, struct rpc_np_write_state);
 	NTSTATUS status;
 
 	status = cli_write_andx_recv(subreq, &state->written);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
-		async_req_nterror(req, status);
+		tevent_req_nterror(req, status);
 		return;
 	}
-	async_req_done(req);
+	tevent_req_done(req);
 }
 
-static NTSTATUS rpc_np_write_recv(struct async_req *req, ssize_t *pwritten)
+static NTSTATUS rpc_np_write_recv(struct tevent_req *req, ssize_t *pwritten)
 {
-	struct rpc_np_write_state *state = talloc_get_type_abort(
-		req->private_data, struct rpc_np_write_state);
+	struct rpc_np_write_state *state = tevent_req_data(
+		req, struct rpc_np_write_state);
 	NTSTATUS status;
 
-	if (async_req_is_nterror(req, &status)) {
+	if (tevent_req_is_nterror(req, &status)) {
 		return status;
 	}
 	*pwritten = state->written;