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

2 files changed, 4 insertions, 4 deletions

diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h
index 803cba8456..698ff2919b 100644
--- a/source4/lib/events/events.h
+++ b/source4/lib/events/events.h
@@ -2,6 +2,6 @@
 #define __LIB_EVENTS_H__
 #define TEVENT_COMPAT_DEFINES 1
 #include <../lib/tevent/tevent.h>
-struct event_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
-struct event_context *event_context_find(TALLOC_CTX *mem_ctx);
+struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
+struct tevent_context *event_context_find(TALLOC_CTX *mem_ctx);
 #endif /* __LIB_EVENTS_H__ */
diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c
index 22e0525263..b3de7e667a 100644
--- a/source4/lib/events/tevent_s4.c
+++ b/source4/lib/events/tevent_s4.c
@@ -59,9 +59,9 @@ static void ev_wrap_debug(void *context, enum ev_debug_level level,
 
   This samba4 specific call sets the samba4 debug handler.
 */
-struct event_context *s4_event_context_init(TALLOC_CTX *mem_ctx)
+struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx)
 {
-	struct event_context *ev;
+	struct tevent_context *ev;
 
 	ev = event_context_init_byname(mem_ctx, NULL);
 	if (ev) {