From f9d0473d024bc7b6efc4619c7c77b5bf992f6d54 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 09:57:22 +0100 Subject: [PATCH] s3:rpc_client: s/struct event_context/struct tevent_context Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/rpc_client/cli_pipe.c | 30 +++++++++++++++--------------- source3/rpc_client/cli_pipe.h | 4 ++-- source3/rpc_client/rpc_transport.h | 8 ++++---- source3/rpc_client/rpc_transport_np.c | 4 ++-- source3/rpc_client/rpc_transport_tstream.c | 6 +++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 012d1f32f57..2743a07ebfd 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -70,7 +70,7 @@ static uint32 get_rpc_call_id(void) ********************************************************************/ struct rpc_read_state { - struct event_context *ev; + struct tevent_context *ev; struct rpc_cli_transport *transport; uint8_t *data; size_t size; @@ -80,7 +80,7 @@ struct rpc_read_state { static void rpc_read_done(struct tevent_req *subreq); static struct tevent_req *rpc_read_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_cli_transport *transport, uint8_t *data, size_t size) { @@ -150,7 +150,7 @@ static NTSTATUS rpc_read_recv(struct tevent_req *req) } struct rpc_write_state { - struct event_context *ev; + struct tevent_context *ev; struct rpc_cli_transport *transport; const uint8_t *data; size_t size; @@ -160,7 +160,7 @@ struct rpc_write_state { static void rpc_write_done(struct tevent_req *subreq); static struct tevent_req *rpc_write_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_cli_transport *transport, const uint8_t *data, size_t size) { @@ -235,7 +235,7 @@ static NTSTATUS rpc_write_recv(struct tevent_req *req) ****************************************************************************/ struct get_complete_frag_state { - struct event_context *ev; + struct tevent_context *ev; struct rpc_pipe_client *cli; uint16_t frag_len; DATA_BLOB *pdu; @@ -245,7 +245,7 @@ static void get_complete_frag_got_header(struct tevent_req *subreq); static void get_complete_frag_got_rest(struct tevent_req *subreq); static struct tevent_req *get_complete_frag_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_pipe_client *cli, DATA_BLOB *pdu) { @@ -509,7 +509,7 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, ****************************************************************************/ struct cli_api_pipe_state { - struct event_context *ev; + struct tevent_context *ev; struct rpc_cli_transport *transport; uint8_t *rdata; uint32_t rdata_len; @@ -520,7 +520,7 @@ static void cli_api_pipe_write_done(struct tevent_req *subreq); static void cli_api_pipe_read_done(struct tevent_req *subreq); static struct tevent_req *cli_api_pipe_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_cli_transport *transport, uint8_t *data, size_t data_len, uint32_t max_rdata_len) @@ -690,7 +690,7 @@ static NTSTATUS cli_api_pipe_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, ****************************************************************************/ struct rpc_api_pipe_state { - struct event_context *ev; + struct tevent_context *ev; struct rpc_pipe_client *cli; uint8_t expected_pkt_type; @@ -708,7 +708,7 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq); static void rpc_api_pipe_auth3_done(struct tevent_req *subreq); static struct tevent_req *rpc_api_pipe_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_pipe_client *cli, DATA_BLOB *data, /* Outgoing PDU */ uint8_t expected_pkt_type) @@ -1163,7 +1163,7 @@ static NTSTATUS create_rpc_bind_req(TALLOC_CTX *mem_ctx, ********************************************************************/ struct rpc_api_pipe_req_state { - struct event_context *ev; + struct tevent_context *ev; struct rpc_pipe_client *cli; uint8_t op_num; uint32_t call_id; @@ -1179,7 +1179,7 @@ static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state, bool *is_last_frag); struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_pipe_client *cli, uint8_t op_num, DATA_BLOB *req_data) @@ -1540,7 +1540,7 @@ static NTSTATUS create_rpc_alter_context(TALLOC_CTX *mem_ctx, ****************************************************************************/ struct rpc_pipe_bind_state { - struct event_context *ev; + struct tevent_context *ev; struct rpc_pipe_client *cli; DATA_BLOB rpc_out; bool auth3; @@ -1562,7 +1562,7 @@ static NTSTATUS rpc_bind_finish_send(struct tevent_req *req, DATA_BLOB *credentials); struct tevent_req *rpc_pipe_bind_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_pipe_client *cli, struct pipe_auth_data *auth) { @@ -1957,7 +1957,7 @@ NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli, struct pipe_auth_data *auth) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h index 343bd0afa50..bf785fb0b52 100644 --- a/source3/rpc_client/cli_pipe.h +++ b/source3/rpc_client/cli_pipe.h @@ -28,7 +28,7 @@ /* The following definitions come from rpc_client/cli_pipe.c */ struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_pipe_client *cli, uint8_t op_num, DATA_BLOB *req_data); @@ -38,7 +38,7 @@ NTSTATUS rpc_api_pipe_req_recv(struct tevent_req *req, DATA_BLOB *reply_pdu); struct tevent_req *rpc_pipe_bind_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct rpc_pipe_client *cli, struct pipe_auth_data *auth); diff --git a/source3/rpc_client/rpc_transport.h b/source3/rpc_client/rpc_transport.h index abab4a0cae9..bc115dda06f 100644 --- a/source3/rpc_client/rpc_transport.h +++ b/source3/rpc_client/rpc_transport.h @@ -36,7 +36,7 @@ struct rpc_cli_transport { * Trigger an async read from the server. May return a short read. */ struct tevent_req *(*read_send)(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, uint8_t *data, size_t size, void *priv); /** @@ -48,7 +48,7 @@ struct rpc_cli_transport { * Trigger an async write to the server. May return a short write. */ struct tevent_req *(*write_send)(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, const uint8_t *data, size_t size, void *priv); /** @@ -63,7 +63,7 @@ struct rpc_cli_transport { * cli_pipe.c will fall back to the explicit write/read routines. */ struct tevent_req *(*trans_send)(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, uint8_t *data, size_t data_len, uint32_t max_rdata_len, void *priv); @@ -82,7 +82,7 @@ struct rpc_cli_transport { /* The following definitions come from rpc_client/rpc_transport_np.c */ struct cli_state; struct tevent_req *rpc_transport_np_init_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const struct ndr_syntax_id *abstract_syntax); NTSTATUS rpc_transport_np_init_recv(struct tevent_req *req, diff --git a/source3/rpc_client/rpc_transport_np.c b/source3/rpc_client/rpc_transport_np.c index db7217e705b..78caa5bae70 100644 --- a/source3/rpc_client/rpc_transport_np.c +++ b/source3/rpc_client/rpc_transport_np.c @@ -32,7 +32,7 @@ struct rpc_transport_np_init_state { static void rpc_transport_np_init_pipe_open(struct tevent_req *subreq); struct tevent_req *rpc_transport_np_init_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const struct ndr_syntax_id *abstract_syntax) { @@ -113,7 +113,7 @@ NTSTATUS rpc_transport_np_init(TALLOC_CTX *mem_ctx, struct cli_state *cli, struct rpc_cli_transport **presult) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; diff --git a/source3/rpc_client/rpc_transport_tstream.c b/source3/rpc_client/rpc_transport_tstream.c index 11cd8d44eb6..ec37c7d5cab 100644 --- a/source3/rpc_client/rpc_transport_tstream.c +++ b/source3/rpc_client/rpc_transport_tstream.c @@ -171,7 +171,7 @@ struct rpc_tstream_read_state { static void rpc_tstream_read_done(struct tevent_req *subreq); static struct tevent_req *rpc_tstream_read_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, uint8_t *data, size_t size, void *priv) { @@ -250,7 +250,7 @@ static NTSTATUS rpc_tstream_read_recv(struct tevent_req *req, ssize_t *size) } struct rpc_tstream_write_state { - struct event_context *ev; + struct tevent_context *ev; struct rpc_tstream_state *transp; struct iovec iov; ssize_t nwritten; @@ -259,7 +259,7 @@ struct rpc_tstream_write_state { static void rpc_tstream_write_done(struct tevent_req *subreq); static struct tevent_req *rpc_tstream_write_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, const uint8_t *data, size_t size, void *priv) { -- 2.11.4.GIT