From e5f6250ae26ba103b1682ae933b61732247795e8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 10:53:02 +0100 Subject: [PATCH] s3:smbd: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_ Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/smbd/notify_inotify.c | 2 +- source3/smbd/oplock_irix.c | 4 ++-- source3/smbd/process.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c index c1543965a7d..4e9a87e6f9f 100644 --- a/source3/smbd/notify_inotify.c +++ b/source3/smbd/notify_inotify.c @@ -269,7 +269,7 @@ static NTSTATUS inotify_setup(struct sys_notify_context *ctx) talloc_set_destructor(in, inotify_destructor); /* add a event waiting for the inotify fd to be readable */ - event_add_fd(ctx->ev, in, in->fd, EVENT_FD_READ, inotify_handler, in); + tevent_add_fd(ctx->ev, in, in->fd, TEVENT_FD_READ, inotify_handler, in); return NT_STATUS_OK; } diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index 635f8320bf6..694ca086e38 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/smbd/oplock_irix.c @@ -334,10 +334,10 @@ struct kernel_oplocks *irix_init_kernel_oplocks(struct smbd_server_connection *s ctx->read_fd = pfd[0]; ctx->write_fd = pfd[1]; - ctx->read_fde = event_add_fd(sconn->ev_ctx, + ctx->read_fde = tevent_add_fd(sconn->ev_ctx, ctx, ctx->read_fd, - EVENT_FD_READ, + TEVENT_FD_READ, irix_oplocks_read_fde_handler, ctx); return _ctx; diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 2081a347ba8..0a8e62c85a7 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -3594,10 +3594,10 @@ void smbd_process(struct tevent_context *ev_ctx, exit_server("init_dptrs() failed"); } - sconn->smb1.fde = event_add_fd(ev_ctx, + sconn->smb1.fde = tevent_add_fd(ev_ctx, sconn, sconn->sock, - EVENT_FD_READ, + TEVENT_FD_READ, smbd_server_connection_handler, sconn); if (!sconn->smb1.fde) { -- 2.11.4.GIT