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 --- lib/tevent/testsuite.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/tevent/testsuite.c') diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c index 7f2729ceff..ec57c5ad2e 100644 --- a/lib/tevent/testsuite.c +++ b/lib/tevent/testsuite.c @@ -26,7 +26,7 @@ static int fde_count; -static void fde_handler(struct event_context *ev_ctx, struct fd_event *f, +static void fde_handler(struct tevent_context *ev_ctx, struct tevent_fd *f, uint16_t flags, void *private) { int *fd = (int *)private; @@ -40,14 +40,14 @@ static void fde_handler(struct event_context *ev_ctx, struct fd_event *f, fde_count++; } -static void finished_handler(struct event_context *ev_ctx, struct timed_event *te, +static void finished_handler(struct tevent_context *ev_ctx, struct tevent_timer *te, struct timeval tval, void *private) { int *finished = (int *)private; (*finished) = 1; } -static void count_handler(struct event_context *ev_ctx, struct signal_event *te, +static void count_handler(struct tevent_context *ev_ctx, struct signal_event *te, int signum, int count, void *info, void *private) { int *countp = (int *)private; @@ -57,11 +57,11 @@ static void count_handler(struct event_context *ev_ctx, struct signal_event *te, static bool test_event_context(struct torture_context *test, const void *test_data) { - struct event_context *ev_ctx; + struct tevent_context *ev_ctx; int fd[2] = { -1, -1 }; const char *backend = (const char *)test_data; int alarm_count=0, info_count=0; - struct fd_event *fde; + struct tevent_fd *fde; struct signal_event *se1, *se2, *se3; int finished=0; struct timeval t; -- cgit