summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-05-25 15:27:41 -0400
committerSimo Sorce <idra@samba.org>2011-08-13 09:54:16 -0400
commitb1feb9d4324dfca7190ec3816d43392b65a94671 (patch)
tree9ea26552dddedc46264f763368f18f266618fb09
parent4a8fdc3958b7bc42bd90d4307f6fb0556944b300 (diff)
downloadsamba-b1feb9d4324dfca7190ec3816d43392b65a94671.tar.gz
samba-b1feb9d4324dfca7190ec3816d43392b65a94671.tar.bz2
samba-b1feb9d4324dfca7190ec3816d43392b65a94671.zip
s4:ntvfs: use tevent_ fn names instead of legacy event_ ones
-rw-r--r--source4/ntvfs/posix/pvfs_notify.c2
-rw-r--r--source4/ntvfs/posix/pvfs_search.c2
-rw-r--r--source4/ntvfs/posix/pvfs_wait.c2
-rw-r--r--source4/ntvfs/posix/pvfs_write.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c
index 6a857dbf65..316353f38f 100644
--- a/source4/ntvfs/posix/pvfs_notify.c
+++ b/source4/ntvfs/posix/pvfs_notify.c
@@ -109,7 +109,7 @@ static void pvfs_notify_send(struct pvfs_notify_buffer *notify_buffer,
/* we can't call pvfs_notify_send() directly here, as that
would free the request, and the ntvfs modules above us
could use it, so call it on the next event */
- event_add_timed(req->ctx->event_ctx,
+ tevent_add_timer(req->ctx->event_ctx,
req, timeval_zero(), pvfs_notify_send_next, req);
}
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index 893f55c5ac..8cba72da43 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -61,7 +61,7 @@ static void pvfs_search_setup_timer(struct pvfs_search_state *search)
struct tevent_context *ev = search->pvfs->ntvfs->ctx->event_ctx;
if (search->handle == INVALID_SEARCH_HANDLE) return;
talloc_free(search->te);
- search->te = event_add_timed(ev, search,
+ search->te = tevent_add_timer(ev, search,
timeval_current_ofs(search->pvfs->search.inactivity_time, 0),
pvfs_search_timer, search);
}
diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c
index 013de69889..89b0cee2f1 100644
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -156,7 +156,7 @@ struct pvfs_wait *pvfs_wait_message(struct pvfs_state *pvfs,
if (!timeval_is_zero(&end_time)) {
/* setup a timer */
- event_add_timed(pwait->ev, pwait, end_time, pvfs_wait_timeout, pwait);
+ tevent_add_timer(pwait->ev, pwait, end_time, pvfs_wait_timeout, pwait);
}
/* register with the messaging subsystem for this message
diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c
index 892d3dd749..544e254300 100644
--- a/source4/ntvfs/posix/pvfs_write.c
+++ b/source4/ntvfs/posix/pvfs_write.c
@@ -68,12 +68,12 @@ static void pvfs_trigger_write_time_update(struct pvfs_file_handle *h)
h->write_time.update_triggered = true;
h->write_time.update_on_close = true;
- h->write_time.update_event = event_add_timed(pvfs->ntvfs->ctx->event_ctx,
+ h->write_time.update_event = tevent_add_timer(pvfs->ntvfs->ctx->event_ctx,
h, tv,
pvfs_write_time_update_handler,
h);
if (!h->write_time.update_event) {
- DEBUG(0,("Failed event_add_timed\n"));
+ DEBUG(0,("Failed tevent_add_timer\n"));
}
}