From 183c379fe58ca60f5ef2d1f2033d035d4117ac8f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 29 Dec 2008 20:24:57 +0100 Subject: s4:lib/tevent: rename structs list="" list="$list event_context:tevent_context" list="$list fd_event:tevent_fd" list="$list timed_event:tevent_timer" for s in $list; do o=`echo $s | cut -d ':' -f1` n=`echo $s | cut -d ':' -f2` r=`git grep "struct $o" |cut -d ':' -f1 |sort -u` files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4` for f in $files; do cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp mv $f.tmp $f done done metze --- source4/ldap_server/ldap_server.c | 10 +++++----- source4/ldap_server/ldap_server.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/ldap_server') diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index f08f24595a..ed8e6d3a2c 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -167,8 +167,8 @@ static NTSTATUS ldapsrv_decode(void *private, DATA_BLOB blob) /* Idle timeout handler */ -static void ldapsrv_conn_idle_timeout(struct event_context *ev, - struct timed_event *te, +static void ldapsrv_conn_idle_timeout(struct tevent_context *ev, + struct tevent_timer *te, struct timeval t, void *private) { @@ -214,8 +214,8 @@ static void ldapsrv_send(struct stream_connection *c, uint16_t flags) packet_queue_run(conn->packet); } -static void ldapsrv_conn_init_timeout(struct event_context *ev, - struct timed_event *te, +static void ldapsrv_conn_init_timeout(struct tevent_context *ev, + struct tevent_timer *te, struct timeval t, void *private) { @@ -440,7 +440,7 @@ static const struct stream_server_ops ldap_stream_ops = { /* add a socket address to the list of events, one event per port */ -static NTSTATUS add_socket(struct event_context *event_context, +static NTSTATUS add_socket(struct tevent_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops, const char *address, struct ldapsrv_service *ldap_service) diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h index 4f7a5b9be9..efa802d173 100644 --- a/source4/ldap_server/ldap_server.h +++ b/source4/ldap_server/ldap_server.h @@ -47,8 +47,8 @@ struct ldapsrv_connection { int max_page_size; int search_timeout; - struct timed_event *ite; - struct timed_event *te; + struct tevent_timer *ite; + struct tevent_timer *te; } limits; }; -- cgit