summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-05-25 15:29:14 -0400
committerSimo Sorce <idra@samba.org>2011-08-14 00:38:13 +0200
commitc84caabf8c5061af75d9e046813c1e2e8eff3722 (patch)
tree8a3d17fba989ad958f6ca0bf5d0102f7f5d04f0a /source4
parent15efcbaa09472b306a875178ee535a06d1b01811 (diff)
downloadsamba-c84caabf8c5061af75d9e046813c1e2e8eff3722.tar.gz
samba-c84caabf8c5061af75d9e046813c1e2e8eff3722.tar.bz2
samba-c84caabf8c5061af75d9e046813c1e2e8eff3722.zip
s4:misc: remove last usage of legacy event_ fn names
Autobuild-User: Simo Sorce <idra@samba.org> Autobuild-Date: Sun Aug 14 00:38:13 CEST 2011 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/gensec/socket.c6
-rw-r--r--source4/nbt_server/register.c2
-rw-r--r--source4/nbt_server/wins/winsclient.c4
-rw-r--r--source4/rpc_server/echo/rpc_echo.c2
-rw-r--r--source4/web_server/web_server.c8
-rw-r--r--source4/wrepl_server/wrepl_periodic.c2
6 files changed, 12 insertions, 12 deletions
diff --git a/source4/auth/gensec/socket.c b/source4/auth/gensec/socket.c
index 38eab6ac44..4ee1512e89 100644
--- a/source4/auth/gensec/socket.c
+++ b/source4/auth/gensec/socket.c
@@ -204,7 +204,7 @@ static void gensec_socket_trigger_read(struct tevent_context *ev,
struct gensec_socket *gensec_socket = talloc_get_type(private_data, struct gensec_socket);
gensec_socket->in_extra_read++;
- gensec_socket->recv_handler(gensec_socket->recv_private, EVENT_FD_READ);
+ gensec_socket->recv_handler(gensec_socket->recv_private, TEVENT_FD_READ);
gensec_socket->in_extra_read--;
/* It may well be that, having run the recv handler, we still
@@ -212,7 +212,7 @@ static void gensec_socket_trigger_read(struct tevent_context *ev,
*/
if (gensec_socket->read_buffer.length && gensec_socket->recv_handler) {
/* Schedule this funcion to run again */
- event_add_timed(gensec_socket->ev, gensec_socket, timeval_zero(),
+ tevent_add_timer(gensec_socket->ev, gensec_socket, timeval_zero(),
gensec_socket_trigger_read, gensec_socket);
}
}
@@ -275,7 +275,7 @@ static NTSTATUS gensec_socket_recv(struct socket_context *sock, void *buf,
/* Manually call a read event, to get this moving
* again (as the socket should be dry, so the normal
* event handler won't trigger) */
- event_add_timed(gensec_socket->ev, gensec_socket, timeval_zero(),
+ tevent_add_timer(gensec_socket->ev, gensec_socket, timeval_zero(),
gensec_socket_trigger_read, gensec_socket);
}
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index b166d46b7f..fb2f9913c5 100644
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -122,7 +122,7 @@ static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname)
refresh_time = MIN(max_refresh_time, iname->ttl/2);
- event_add_timed(iname->iface->nbtsrv->task->event_ctx,
+ tevent_add_timer(iname->iface->nbtsrv->task->event_ctx,
iname,
timeval_add(&iname->registration_time, refresh_time, 0),
name_refresh_handler, iname);
diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c
index 60d2b94dec..b047b2b411 100644
--- a/source4/nbt_server/wins/winsclient.c
+++ b/source4/nbt_server/wins/winsclient.c
@@ -60,7 +60,7 @@ static void nbtd_wins_start_refresh_timer(struct nbtd_iface_name *iname)
refresh_time = MIN(max_refresh_time, iname->ttl/2);
- event_add_timed(iname->iface->nbtsrv->task->event_ctx,
+ tevent_add_timer(iname->iface->nbtsrv->task->event_ctx,
iname,
timeval_add(&iname->registration_time, refresh_time, 0),
nbtd_wins_refresh, iname);
@@ -194,7 +194,7 @@ static void nbtd_wins_register_handler(struct tevent_req *subreq)
/* none of the WINS servers responded - try again
periodically */
int wins_retry_time = lpcfg_parm_int(iname->iface->nbtsrv->task->lp_ctx, NULL, "nbtd", "wins_retry", 300);
- event_add_timed(iname->iface->nbtsrv->task->event_ctx,
+ tevent_add_timer(iname->iface->nbtsrv->task->event_ctx,
iname,
timeval_current_ofs(wins_retry_time, 0),
nbtd_wins_register_retry,
diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c
index 0b10bd3663..4863c779f4 100644
--- a/source4/rpc_server/echo/rpc_echo.c
+++ b/source4/rpc_server/echo/rpc_echo.c
@@ -192,7 +192,7 @@ static long dcesrv_echo_TestSleep(struct dcesrv_call_state *dce_call, TALLOC_CTX
p->dce_call = dce_call;
p->r = r;
- event_add_timed(dce_call->event_ctx, p,
+ tevent_add_timer(dce_call->event_ctx, p,
timeval_add(&dce_call->time, r->in.seconds, 0),
echo_TestSleep_handler, p);
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index cdf6f9b7d0..99a6b65f67 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -96,8 +96,8 @@ void websrv_output_headers(struct websrv_context *web, const char *status, struc
void websrv_output(struct websrv_context *web, void *data, size_t length)
{
data_blob_append(web, &web->output.content, data, length);
- EVENT_FD_NOT_READABLE(web->conn->event.fde);
- EVENT_FD_WRITEABLE(web->conn->event.fde);
+ TEVENT_FD_NOT_READABLE(web->conn->event.fde);
+ TEVENT_FD_WRITEABLE(web->conn->event.fde);
web->output.output_pending = true;
}
@@ -189,7 +189,7 @@ static void websrv_recv(struct stream_connection *conn, uint16_t flags)
if (web->input.partial.length > web->input.content_length) {
web->input.partial.data[web->input.content_length] = 0;
}
- EVENT_FD_NOT_READABLE(web->conn->event.fde);
+ TEVENT_FD_NOT_READABLE(web->conn->event.fde);
/* the reference/unlink code here is quite subtle. It
is needed because the rendering of the web-pages, and
@@ -260,7 +260,7 @@ static void websrv_accept(struct stream_connection *conn)
conn->private_data = web;
talloc_set_destructor(web, websrv_destructor);
- event_add_timed(conn->event.ctx, web,
+ tevent_add_timer(conn->event.ctx, web,
timeval_current_ofs(HTTP_TIMEOUT, 0),
websrv_timeout, web);
diff --git a/source4/wrepl_server/wrepl_periodic.c b/source4/wrepl_server/wrepl_periodic.c
index 94391273ca..aecf47357e 100644
--- a/source4/wrepl_server/wrepl_periodic.c
+++ b/source4/wrepl_server/wrepl_periodic.c
@@ -89,7 +89,7 @@ NTSTATUS wreplsrv_periodic_schedule(struct wreplsrv_service *service, uint32_t n
/* reset the next scheduled timestamp */
service->periodic.next_event = next_time;
- new_te = event_add_timed(service->task->event_ctx, service,
+ new_te = tevent_add_timer(service->task->event_ctx, service,
service->periodic.next_event,
wreplsrv_periodic_handler_te, service);
NT_STATUS_HAVE_NO_MEMORY(new_te);