Replace read_pkt by read_packet in np_read
authorVolker Lendecke <vl@samba.org>
Sun, 22 Feb 2009 22:17:15 +0000 (23:17 +0100)
committerVolker Lendecke <vl@samba.org>
Tue, 24 Feb 2009 19:40:47 +0000 (20:40 +0100)
source3/rpc_server/srv_pipe_hnd.c

index d33d7f64b2904bf89be7eae5f92a0f1afe5502ae..33e89c8acbc600272b749a4de4b96c97c890c29c 100644 (file)
@@ -1314,7 +1314,7 @@ struct np_read_state {
 };
 
 static void np_read_trigger(struct async_req *req);
-static void np_read_done(struct async_req *subreq);
+static void np_read_done(struct tevent_req *subreq);
 
 struct async_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
                               struct fake_file_handle *handle,
@@ -1391,28 +1391,28 @@ static void np_read_trigger(struct async_req *req)
 {
        struct np_read_state *state = talloc_get_type_abort(
                req->private_data, struct np_read_state);
-       struct async_req *subreq;
+       struct tevent_req *subreq;
 
-       subreq = read_pkt_send(state, state->ev, state->p->fd, RPC_HEADER_LEN,
-                              rpc_frag_more_fn, NULL);
+       subreq = read_packet_send(state, state->ev, state->p->fd,
+                                 RPC_HEADER_LEN, rpc_frag_more_fn, NULL);
        if (async_req_nomem(subreq, req)) {
                return;
        }
        subreq->async.fn = np_read_done;
-       subreq->async.priv = req;
+       subreq->async.private_data = req;
 }
 
-static void np_read_done(struct async_req *subreq)
+static void np_read_done(struct tevent_req *subreq)
 {
        struct async_req *req = talloc_get_type_abort(
-               subreq->async.priv, struct async_req);
+               subreq->async.private_data, struct async_req);
        struct np_read_state *state = talloc_get_type_abort(
                req->private_data, struct np_read_state);
        ssize_t received;
        size_t thistime;
        int err;
 
-       received = read_pkt_recv(subreq, state->p, &state->p->msg, &err);
+       received = read_packet_recv(subreq, state->p, &state->p->msg, &err);
        TALLOC_FREE(subreq);
        if (received == -1) {
                async_req_nterror(req, map_nt_error_from_unix(err));