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/wrepl_server/wrepl_periodic.c | 4 ++-- source4/wrepl_server/wrepl_server.c | 2 +- source4/wrepl_server/wrepl_server.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/wrepl_server') diff --git a/source4/wrepl_server/wrepl_periodic.c b/source4/wrepl_server/wrepl_periodic.c index 4559a7f786..4771544428 100644 --- a/source4/wrepl_server/wrepl_periodic.c +++ b/source4/wrepl_server/wrepl_periodic.c @@ -45,7 +45,7 @@ static NTSTATUS wreplsrv_periodic_run(struct wreplsrv_service *service) return NT_STATUS_OK; } -static void wreplsrv_periodic_handler_te(struct event_context *ev, struct timed_event *te, +static void wreplsrv_periodic_handler_te(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *ptr) { struct wreplsrv_service *service = talloc_get_type(ptr, struct wreplsrv_service); @@ -68,7 +68,7 @@ static void wreplsrv_periodic_handler_te(struct event_context *ev, struct timed_ NTSTATUS wreplsrv_periodic_schedule(struct wreplsrv_service *service, uint32_t next_interval) { TALLOC_CTX *tmp_mem; - struct timed_event *new_te; + struct tevent_timer *new_te; struct timeval next_time; /* prevent looping */ diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c index d0b02d0abe..393712c76a 100644 --- a/source4/wrepl_server/wrepl_server.c +++ b/source4/wrepl_server/wrepl_server.c @@ -35,7 +35,7 @@ #include "lib/socket/netif.h" static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, private_path(mem_ctx, diff --git a/source4/wrepl_server/wrepl_server.h b/source4/wrepl_server/wrepl_server.h index a001c6b3ae..7ee5a80624 100644 --- a/source4/wrepl_server/wrepl_server.h +++ b/source4/wrepl_server/wrepl_server.h @@ -154,7 +154,7 @@ struct wreplsrv_partner { struct wreplsrv_pull_cycle_io *cycle_io; /* the current timed_event to the next pull cycle */ - struct timed_event *te; + struct tevent_timer *te; } pull; /* push specific options */ @@ -289,7 +289,7 @@ struct wreplsrv_service { struct timeval next_event; /* here we have a reference to the timed event the schedules the periodic stuff */ - struct timed_event *te; + struct tevent_timer *te; } periodic; /* some stuff for scavenging processing */ -- cgit