From ab81505e080e72c2217cb3946b04eee872397763 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 25 May 2010 15:26:42 -0400 Subject: s4:libcli: use tevent_ fn names instead of legacy event_ ones --- source4/libcli/raw/clitransport.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/libcli/raw/clitransport.c') diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c index 43316692a4..08e49fdd1a 100644 --- a/source4/libcli/raw/clitransport.c +++ b/source4/libcli/raw/clitransport.c @@ -39,11 +39,11 @@ static void smbcli_transport_event_handler(struct tevent_context *ev, { struct smbcli_transport *transport = talloc_get_type(private_data, struct smbcli_transport); - if (flags & EVENT_FD_READ) { + if (flags & TEVENT_FD_READ) { packet_recv(transport->packet); return; } - if (flags & EVENT_FD_WRITE) { + if (flags & TEVENT_FD_WRITE) { packet_queue_run(transport->packet); } } @@ -113,10 +113,10 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock, /* take over event handling from the socket layer - it only handles events up until we are connected */ talloc_free(transport->socket->event.fde); - transport->socket->event.fde = event_add_fd(transport->socket->event.ctx, + transport->socket->event.fde = tevent_add_fd(transport->socket->event.ctx, transport->socket->sock, socket_get_fd(transport->socket->sock), - EVENT_FD_READ, + TEVENT_FD_READ, smbcli_transport_event_handler, transport); @@ -312,7 +312,7 @@ static void idle_handler(struct tevent_context *ev, struct smbcli_transport *transport = talloc_get_type(private_data, struct smbcli_transport); struct timeval next = timeval_add(&t, 0, transport->idle.period); - transport->socket->event.te = event_add_timed(transport->socket->event.ctx, + transport->socket->event.te = tevent_add_timer(transport->socket->event.ctx, transport, next, idle_handler, transport); @@ -336,7 +336,7 @@ _PUBLIC_ void smbcli_transport_idle_handler(struct smbcli_transport *transport, talloc_free(transport->socket->event.te); } - transport->socket->event.te = event_add_timed(transport->socket->event.ctx, + transport->socket->event.te = tevent_add_timer(transport->socket->event.ctx, transport, timeval_current_ofs_usec(period), idle_handler, transport); @@ -609,7 +609,7 @@ void smbcli_transport_send(struct smbcli_request *req) /* add a timeout */ if (req->transport->options.request_timeout) { - event_add_timed(req->transport->socket->event.ctx, req, + tevent_add_timer(req->transport->socket->event.ctx, req, timeval_current_ofs(req->transport->options.request_timeout, 0), smbcli_timeout_handler, req); } -- cgit