From 7221ce9bd5b0a3dde9d32d403cce465b642289fb Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 26 Oct 2011 15:43:08 +0200 Subject: s3:libsmb: use 'tevent_' instead of 'event_' in clitrans.c metze --- source3/libsmb/clitrans.c | 8 ++++---- source3/libsmb/proto.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index f487a34864..bde2ef3d76 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -29,7 +29,7 @@ struct trans_recvblob { struct cli_trans_state { struct cli_state *cli; - struct event_context *ev; + struct tevent_context *ev; uint8_t cmd; uint16_t mid; const char *pipe_name; @@ -375,7 +375,7 @@ static void cli_trans_format(struct cli_trans_state *state, uint8_t *pwct, static void cli_trans_done(struct tevent_req *subreq); struct tevent_req *cli_trans_send( - TALLOC_CTX *mem_ctx, struct event_context *ev, + TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, uint8_t cmd, const char *pipe_name, uint16_t fid, uint16_t function, int flags, uint16_t *setup, uint8_t num_setup, uint8_t max_setup, @@ -723,7 +723,7 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli, uint8_t **rdata, uint32_t min_rdata, uint32_t *num_rdata) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -735,7 +735,7 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index ffb2ca0117..e1f2c3e633 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -822,7 +822,7 @@ size_t clistr_pull_talloc(TALLOC_CTX *ctx, /* The following definitions come from libsmb/clitrans.c */ struct tevent_req *cli_trans_send( - TALLOC_CTX *mem_ctx, struct event_context *ev, + TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, uint8_t cmd, const char *pipe_name, uint16_t fid, uint16_t function, int flags, uint16_t *setup, uint8_t num_setup, uint8_t max_setup, -- cgit