From 64145e7958204f2b2c444e8e904b533dd2108290 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 10:53:02 +0100 Subject: [PATCH] s3:modules: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_ Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/modules/vfs_aio_pthread.c | 2 +- source3/modules/vfs_notify_fam.c | 4 ++-- source3/modules/vfs_preopen.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/modules/vfs_aio_pthread.c b/source3/modules/vfs_aio_pthread.c index 5642a89e2dc..f7756b946c9 100644 --- a/source3/modules/vfs_aio_pthread.c +++ b/source3/modules/vfs_aio_pthread.c @@ -162,7 +162,7 @@ static void aio_open_handle_completion(struct tevent_context *event_ctx, DEBUG(10, ("aio_open_handle_completion called with flags=%d\n", (int)flags)); - if ((flags & EVENT_FD_READ) == 0) { + if ((flags & TEVENT_FD_READ) == 0) { return; } diff --git a/source3/modules/vfs_notify_fam.c b/source3/modules/vfs_notify_fam.c index f10a4c9c943..54df0e4f243 100644 --- a/source3/modules/vfs_notify_fam.c +++ b/source3/modules/vfs_notify_fam.c @@ -113,9 +113,9 @@ static NTSTATUS fam_open_connection(FAMConnection *fam_conn, return NT_STATUS_UNEXPECTED_IO_ERROR; } - if (event_add_fd(event_ctx, event_ctx, + if (tevent_add_fd(event_ctx, event_ctx, FAMCONNECTION_GETFD(fam_conn), - EVENT_FD_READ, fam_handler, + TEVENT_FD_READ, fam_handler, (void *)fam_conn) == NULL) { DEBUG(0, ("event_add_fd failed\n")); FAMClose(fam_conn); diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c index 175298685ac..612b0252e22 100644 --- a/source3/modules/vfs_preopen.c +++ b/source3/modules/vfs_preopen.c @@ -115,7 +115,7 @@ static void preopen_helper_readable(struct tevent_context *ev, ssize_t nread; char c; - if ((flags & EVENT_FD_READ) == 0) { + if ((flags & TEVENT_FD_READ) == 0) { return; } @@ -237,8 +237,8 @@ static NTSTATUS preopen_init_helper(struct preopen_helper *h) } close(fdpair[1]); h->fd = fdpair[0]; - h->fde = event_add_fd(server_event_context(), h->state, h->fd, - EVENT_FD_READ, preopen_helper_readable, h); + h->fde = tevent_add_fd(server_event_context(), h->state, h->fd, + TEVENT_FD_READ, preopen_helper_readable, h); if (h->fde == NULL) { close(h->fd); h->fd = -1; -- 2.11.4.GIT