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

7 files changed, 16 insertions, 16 deletions

diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index 59cdd642bb..a7384f117d 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -62,7 +62,7 @@ const char *dcesrv_common_get_server_name(TALLOC_CTX *mem_ctx, struct dcesrv_con
 
 
 /* This hardcoded value should go into a ldb database! */
-uint32_t dcesrv_common_get_server_type(TALLOC_CTX *mem_ctx, struct event_context *event_ctx, struct dcesrv_context *dce_ctx)
+uint32_t dcesrv_common_get_server_type(TALLOC_CTX *mem_ctx, struct tevent_context *event_ctx, struct dcesrv_context *dce_ctx)
 {
 	int default_server_announce = 0;
 	default_server_announce |= SV_TYPE_WORKSTATION;
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index d27a8b90de..e4be2e3123 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -295,7 +295,7 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
 				 TALLOC_CTX *mem_ctx,
 				 const struct dcesrv_endpoint *ep,
 				 struct auth_session_info *session_info,
-				 struct event_context *event_ctx,
+				 struct tevent_context *event_ctx,
 				 struct messaging_context *msg_ctx,
 				 struct server_id server_id,
 				 uint32_t state_flags,
@@ -346,7 +346,7 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
 					TALLOC_CTX *mem_ctx,
 					const struct dcerpc_binding *ep_description,
 					struct auth_session_info *session_info,
-					struct event_context *event_ctx,
+					struct tevent_context *event_ctx,
 					struct messaging_context *msg_ctx,
 					struct server_id server_id,
 					uint32_t state_flags,
diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index 28f4308433..51ad546ab4 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -108,7 +108,7 @@ struct dcesrv_call_state {
 	struct timeval time;
 
 	/* the backend can use this event context for async replies */
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 
 	/* the message_context that will be used for async replies */
 	struct messaging_context *msg_ctx;
@@ -199,7 +199,7 @@ struct dcesrv_connection {
 	struct dcesrv_auth auth_state;
 
 	/* the event_context that will be used for this connection */
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 
 	/* the message_context that will be used for this connection */
 	struct messaging_context *msg_ctx;
@@ -301,7 +301,7 @@ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
 					TALLOC_CTX *mem_ctx,
 					const struct dcerpc_binding *ep_description,
 					struct auth_session_info *session_info,
-					struct event_context *event_ctx,
+					struct tevent_context *event_ctx,
 					struct messaging_context *msg_ctx,
 					struct server_id server_id,
 					uint32_t state_flags,
@@ -314,7 +314,7 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
 				 TALLOC_CTX *mem_ctx,
 				 const struct dcesrv_endpoint *ep,
 				 struct auth_session_info *session_info,
-				 struct event_context *event_ctx,
+				 struct tevent_context *event_ctx,
 				 struct messaging_context *msg_ctx,
 				 struct server_id server_id,
 				 uint32_t state_flags,
diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c
index f188ef0a0d..7bb117477c 100644
--- a/source4/rpc_server/echo/rpc_echo.c
+++ b/source4/rpc_server/echo/rpc_echo.c
@@ -156,7 +156,7 @@ struct echo_TestSleep_private {
 	struct echo_TestSleep *r;
 };
 
-static void echo_TestSleep_handler(struct event_context *ev, struct timed_event *te, 
+static void echo_TestSleep_handler(struct tevent_context *ev, struct tevent_timer *te, 
 				   struct timeval t, void *private)
 {
 	struct echo_TestSleep_private *p = talloc_get_type(private, 
diff --git a/source4/rpc_server/lsa/lsa_lookup.c b/source4/rpc_server/lsa/lsa_lookup.c
index a56e7764a9..dc47d3783a 100644
--- a/source4/rpc_server/lsa/lsa_lookup.c
+++ b/source4/rpc_server/lsa/lsa_lookup.c
@@ -236,7 +236,7 @@ static NTSTATUS lookup_well_known_sids(TALLOC_CTX *mem_ctx,
 /*
   lookup a SID for 1 name
 */
-static NTSTATUS dcesrv_lsa_lookup_name(struct event_context *ev_ctx, 
+static NTSTATUS dcesrv_lsa_lookup_name(struct tevent_context *ev_ctx, 
 				       struct loadparm_context *lp_ctx,
 				       struct lsa_policy_state *state, TALLOC_CTX *mem_ctx,
 				const char *name, const char **authority_name, 
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index a2367c8a9b..fc7fded63b 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -287,7 +287,7 @@ static NTSTATUS dcesrv_netr_ServerAuthenticate2(struct dcesrv_call_state *dce_ca
   the caller needs some of that information.
 
 */
-static NTSTATUS dcesrv_netr_creds_server_step_check(struct event_context *event_ctx, 
+static NTSTATUS dcesrv_netr_creds_server_step_check(struct tevent_context *event_ctx, 
 						    struct loadparm_context *lp_ctx,
 						    const char *computer_name,
 					     TALLOC_CTX *mem_ctx, 
diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 6c19b2346b..ec10c748f0 100644
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -227,7 +227,7 @@ static const struct stream_server_ops dcesrv_stream_ops = {
 static NTSTATUS dcesrv_add_ep_unix(struct dcesrv_context *dce_ctx, 
 				   struct loadparm_context *lp_ctx,
 				   struct dcesrv_endpoint *e,
-			    struct event_context *event_ctx, const struct model_ops *model_ops)
+			    struct tevent_context *event_ctx, const struct model_ops *model_ops)
 {
 	struct dcesrv_socket_context *dcesrv_sock;
 	uint16_t port = 1;
@@ -256,7 +256,7 @@ static NTSTATUS dcesrv_add_ep_unix(struct dcesrv_context *dce_ctx,
 static NTSTATUS dcesrv_add_ep_ncalrpc(struct dcesrv_context *dce_ctx, 
 				      struct loadparm_context *lp_ctx,
 				      struct dcesrv_endpoint *e,
-				      struct event_context *event_ctx, const struct model_ops *model_ops)
+				      struct tevent_context *event_ctx, const struct model_ops *model_ops)
 {
 	struct dcesrv_socket_context *dcesrv_sock;
 	uint16_t port = 1;
@@ -295,7 +295,7 @@ static NTSTATUS dcesrv_add_ep_ncalrpc(struct dcesrv_context *dce_ctx,
 static NTSTATUS dcesrv_add_ep_np(struct dcesrv_context *dce_ctx,
 				 struct loadparm_context *lp_ctx,
 				 struct dcesrv_endpoint *e,
-				 struct event_context *event_ctx, const struct model_ops *model_ops)
+				 struct tevent_context *event_ctx, const struct model_ops *model_ops)
 {
 	struct dcesrv_socket_context *dcesrv_sock;
 	NTSTATUS status;
@@ -328,7 +328,7 @@ static NTSTATUS dcesrv_add_ep_np(struct dcesrv_context *dce_ctx,
   add a socket address to the list of events, one event per dcerpc endpoint
 */
 static NTSTATUS add_socket_rpc_tcp_iface(struct dcesrv_context *dce_ctx, struct dcesrv_endpoint *e,
-					 struct event_context *event_ctx, const struct model_ops *model_ops,
+					 struct tevent_context *event_ctx, const struct model_ops *model_ops,
 					 const char *address)
 {
 	struct dcesrv_socket_context *dcesrv_sock;
@@ -366,7 +366,7 @@ static NTSTATUS add_socket_rpc_tcp_iface(struct dcesrv_context *dce_ctx, struct
 static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx, 
 				  struct loadparm_context *lp_ctx,
 				  struct dcesrv_endpoint *e,
-				  struct event_context *event_ctx, const struct model_ops *model_ops)
+				  struct tevent_context *event_ctx, const struct model_ops *model_ops)
 {
 	NTSTATUS status;
 
@@ -397,7 +397,7 @@ static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx,
 static NTSTATUS dcesrv_add_ep(struct dcesrv_context *dce_ctx, 
 			      struct loadparm_context *lp_ctx,
 			      struct dcesrv_endpoint *e,
-			  struct event_context *event_ctx, const struct model_ops *model_ops)
+			  struct tevent_context *event_ctx, const struct model_ops *model_ops)
 {
 	switch (e->ep_description->transport) {
 	case NCACN_UNIX_STREAM: