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

5 files changed, 7 insertions, 7 deletions

diff --git a/source4/libnet/libnet.c b/source4/libnet/libnet.c
index c966898cee..b10fb65df6 100644
--- a/source4/libnet/libnet.c
+++ b/source4/libnet/libnet.c
@@ -23,7 +23,7 @@
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
 
-struct libnet_context *libnet_context_init(struct event_context *ev,
+struct libnet_context *libnet_context_init(struct tevent_context *ev,
 					   struct loadparm_context *lp_ctx)
 {
 	struct libnet_context *ctx;
diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index b65a13ce37..543a131806 100644
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -49,7 +49,7 @@ struct libnet_context {
 	/* name resolution methods */
 	struct resolve_context *resolve_ctx;
 
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 
 	struct loadparm_context *lp_ctx;
 };
diff --git a/source4/libnet/libnet_samdump_keytab.c b/source4/libnet/libnet_samdump_keytab.c
index 62d93904ef..2218d20f6b 100644
--- a/source4/libnet/libnet_samdump_keytab.c
+++ b/source4/libnet/libnet_samdump_keytab.c
@@ -29,7 +29,7 @@
 #include "lib/events/events.h"
 
 static NTSTATUS samdump_keytab_handle_user(TALLOC_CTX *mem_ctx,
-					   struct event_context *event_ctx,
+					   struct tevent_context *event_ctx,
 					   struct loadparm_context *lp_ctx,
 					    const char *keytab_name,
 					    struct netr_DELTA_ENUM *delta) 
@@ -70,7 +70,7 @@ static NTSTATUS samdump_keytab_handle_user(TALLOC_CTX *mem_ctx,
 
 struct libnet_samdump_keytab_data {
 	const char *keytab_name;
-	struct event_context *ev_ctx;
+	struct tevent_context *ev_ctx;
 	struct loadparm_context *lp_ctx;
 };
 
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 7b686ba007..4140de0686 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -70,7 +70,7 @@ struct vampire_state {
 	const char *targetdir;
 
 	struct loadparm_context *lp_ctx;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 };
 
 static NTSTATUS vampire_prepare_db(void *private_data,
diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 887c3f466c..4770cff82d 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -27,7 +27,7 @@
 /* FIXME: This prototype should be in param/pyparam.h */
 struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx);
 
-static struct libnet_context *py_net_ctx(PyObject *obj, struct event_context *ev)
+static struct libnet_context *py_net_ctx(PyObject *obj, struct tevent_context *ev)
 {
 	/* FIXME: Use obj */
 	return libnet_context_init(ev, py_default_loadparm_context(NULL));
@@ -39,7 +39,7 @@ static PyObject *py_net_join(PyObject *cls, PyObject *args, PyObject *kwargs)
 	NTSTATUS status;
 	PyObject *result;
 	TALLOC_CTX *mem_ctx;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct libnet_context *libnet_ctx;
 	const char *kwnames[] = { "domain_name", "netbios_name", "join_type", "level", NULL };