summaryrefslogtreecommitdiff
path: root/source4/web_server/web_server.c
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/web_server/web_server.c
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/web_server/web_server.c')
-rw-r--r--source4/web_server/web_server.c8
1 files changed, 4 insertions, 4 deletions
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);