s4:libcli: use tevent_ fn names instead of legacy event_ ones

2 files changed, 8 insertions, 8 deletions

diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 729b003aed..cf416a61cf 100644
--- a/source4/libcli/smb2/request.c
+++ b/source4/libcli/smb2/request.c
@@ -214,7 +214,7 @@ bool smb2_request_receive(struct smb2_request *req)
 
 	/* keep receiving packets until this one is replied to */
 	while (req->state <= SMB2_REQUEST_RECV) {
-		if (event_loop_once(req->transport->socket->event.ctx) != 0) {
+		if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
 			return false;
 		}
 	}
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 04b2d38327..538cb5f1de 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -39,11 +39,11 @@ static void smb2_transport_event_handler(struct tevent_context *ev,
 {
 	struct smb2_transport *transport = talloc_get_type(private_data,
 							   struct smb2_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);
 	}
 }
@@ -104,10 +104,10 @@ struct smb2_transport *smb2_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,
 						    socket_get_fd(transport->socket->sock),
-						    EVENT_FD_READ,
+						    TEVENT_FD_READ,
 						    smb2_transport_event_handler,
 						    transport);
 
@@ -525,7 +525,7 @@ void smb2_transport_send(struct smb2_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), 
 				smb2_timeout_handler, req);
 	}
@@ -565,7 +565,7 @@ static void idle_handler(struct tevent_context *ev,
 	struct smb2_transport *transport = talloc_get_type(private_data,
 							   struct smb2_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);
@@ -589,7 +589,7 @@ void smb2_transport_idle_handler(struct smb2_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(0, period),
 						      idle_handler, transport);