summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-02-18 09:57:48 +0100
committerMichael Adam <obnox@samba.org>2013-02-19 23:47:52 +0100
commitcf1f993c057cf296edfd5c28b2f9cd84862340d0 (patch)
tree2499ea521f707d9b1e29a00879ea4f1db5d2632f
parentf9d0473d024bc7b6efc4619c7c77b5bf992f6d54 (diff)
downloadsamba-cf1f993c057cf296edfd5c28b2f9cd84862340d0.tar.gz
samba-cf1f993c057cf296edfd5c28b2f9cd84862340d0.tar.bz2
samba-cf1f993c057cf296edfd5c28b2f9cd84862340d0.zip
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>
-rw-r--r--source3/rpc_server/samr/srv_samr_nt.c2
-rw-r--r--source3/rpc_server/srv_pipe_hnd.c6
-rw-r--r--source3/rpc_server/srv_pipe_hnd.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 580638b74d..e312cb10a3 100644
--- 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 0c615bdc37..3f8ff44767 100644
--- 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 48511e466e..286efe0577 100644
--- 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,