s3:rpc_server: s/struct event_context/struct tevent_context

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 580638b74d5b6556043391acffcdc8e2dbaa7c88..e312cb10a360aa9477f7f096c5bfb679b7ec3b14 100644 (file)
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -278,7 +278,7 @@ static void free_samr_cache(DISP_INFO *disp_info)
  Idle event handler. Throw away the disp info cache.
  ********************************************************************/
 
-static void disp_info_cache_idle_timeout_handler(struct event_context *ev_ctx,
+static void disp_info_cache_idle_timeout_handler(struct tevent_context *ev_ctx,
                                                 struct timed_event *te,
                                                 struct timeval now,
                                                 void *private_data)

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 0c615bdc3708b1914c8b1c6b9d613bdebfde6122..3f8ff44767b9232e0d762c0a1b0403c1311517d2 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -501,7 +501,7 @@ bool np_read_in_progress(struct fake_file_handle *handle)
 }
 
 struct np_write_state {
-       struct event_context *ev;
+       struct tevent_context *ev;
        struct np_proxy_state *p;
        struct iovec iov;
        ssize_t nwritten;
@@ -509,7 +509,7 @@ struct np_write_state {
 
 static void np_write_done(struct tevent_req *subreq);
 
-struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                                 struct fake_file_handle *handle,
                                 const uint8_t *data, size_t len)
 {
@@ -693,7 +693,7 @@ struct np_read_state {
 
 static void np_read_done(struct tevent_req *subreq);
 
-struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                                struct fake_file_handle *handle,
                                uint8_t *data, size_t len)
 {

diff --git a/source3/rpc_server/srv_pipe_hnd.h b/source3/rpc_server/srv_pipe_hnd.h
index 48511e466edd8be06acde65acfa9413ad5763e3b..286efe057730d67dbfe025a87327b4aa76864bba 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.h
+++ b/source3/rpc_server/srv_pipe_hnd.h
@@ -35,11 +35,11 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
                 struct messaging_context *msg_ctx,
                 struct fake_file_handle **phandle);
 bool np_read_in_progress(struct fake_file_handle *handle);
-struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                                 struct fake_file_handle *handle,
                                 const uint8_t *data, size_t len);
 NTSTATUS np_write_recv(struct tevent_req *req, ssize_t *pnwritten);
-struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                                struct fake_file_handle *handle,
                                uint8_t *data, size_t len);
 NTSTATUS np_read_recv(struct tevent_req *req, ssize_t *nread,