Skip to content

Commit

Permalink
s3:modules: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
  • Loading branch information
metze-samba authored and obnoxxx committed Feb 19, 2013
1 parent c085803 commit 64145e7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion source3/modules/vfs_aio_pthread.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions source3/modules/vfs_notify_fam.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions source3/modules/vfs_preopen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 64145e7

Please sign in to comment.