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

15 files changed, 25 insertions, 25 deletions

diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index dbe4722d37e..135458a00fd 100644
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -84,7 +84,7 @@ static int notify_destructor(struct notify_context *notify)
 struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, 
 				   struct messaging_context *messaging_ctx,
 				   struct loadparm_context *lp_ctx,
-				   struct event_context *ev,
+				   struct tevent_context *ev,
 				   struct share_config *scfg)
 {
 	struct notify_context *notify;
diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c
index 07a8b6d1d6e..04ea70030ef 100644
--- a/source4/ntvfs/ipc/ipc_rap.c
+++ b/source4/ntvfs/ipc/ipc_rap.c
@@ -100,13 +100,13 @@ struct rap_call {
 	struct ndr_pull *ndr_pull_param;
 	struct ndr_pull *ndr_pull_data;
 
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 };
 
 #define RAPNDR_FLAGS (LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
 
 static struct rap_call *new_rap_srv_call(TALLOC_CTX *mem_ctx,
-					 struct event_context *ev_ctx,
+					 struct tevent_context *ev_ctx,
 					 struct loadparm_context *lp_ctx,
 					 struct smb_trans2 *trans)
 {
@@ -433,7 +433,7 @@ static const struct
 	{NULL, -1, api_Unsupported}
 };
 
-NTSTATUS ipc_rap_call(TALLOC_CTX *mem_ctx, struct event_context *event_ctx, struct loadparm_context *lp_ctx,
+NTSTATUS ipc_rap_call(TALLOC_CTX *mem_ctx, struct tevent_context *event_ctx, struct loadparm_context *lp_ctx,
 		      struct smb_trans2 *trans)
 {
 	int i;
diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index 077ecaf79f6..df065eb5e2f 100644
--- a/source4/ntvfs/ipc/rap_server.c
+++ b/source4/ntvfs/ipc/rap_server.c
@@ -31,7 +31,7 @@
  * idea. */
 
 NTSTATUS rap_netshareenum(TALLOC_CTX *mem_ctx,
-			  struct event_context *event_ctx,
+			  struct tevent_context *event_ctx,
 			  struct loadparm_context *lp_ctx,
 			  struct rap_NetShareEnum *r)
 {
diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index 8433a431b0e..5e86030efae 100644
--- a/source4/ntvfs/ntvfs.h
+++ b/source4/ntvfs/ntvfs.h
@@ -200,7 +200,7 @@ struct ntvfs_context {
 
 	struct server_id server_id;
 	struct loadparm_context *lp_ctx;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 	struct messaging_context *msg_ctx;
 
 	struct {
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index c2501aaba9f..b581588d9d9 100644
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -153,7 +153,7 @@ bool ntvfs_interface_differs(const struct ntvfs_critical_sizes *const iface)
 NTSTATUS ntvfs_init_connection(TALLOC_CTX *mem_ctx, struct share_config *scfg, enum ntvfs_type type,
 			       enum protocol_types protocol,
 			       uint64_t ntvfs_client_caps,
-			       struct event_context *ev, struct messaging_context *msg,
+			       struct tevent_context *ev, struct messaging_context *msg,
 			       struct loadparm_context *lp_ctx,
 			       struct server_id server_id, struct ntvfs_context **_ctx)
 {
diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c
index 719b7fa5fc7..8224d36b7dd 100644
--- a/source4/ntvfs/posix/pvfs_notify.c
+++ b/source4/ntvfs/posix/pvfs_notify.c
@@ -46,7 +46,7 @@ struct pvfs_notify_buffer {
 /*
   send a notify on the next event run. 
 */
-static void pvfs_notify_send_next(struct event_context *ev, struct timed_event *te, 
+static void pvfs_notify_send_next(struct tevent_context *ev, struct tevent_timer *te, 
 				  struct timeval t, void *ptr)
 {
 	struct ntvfs_request *req = talloc_get_type(ptr, struct ntvfs_request);
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index b8468457318..22aa297210b 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -46,7 +46,7 @@ static int pvfs_search_destructor(struct pvfs_search_state *search)
 /*
   called when a search timer goes off
 */
-static void pvfs_search_timer(struct event_context *ev, struct timed_event *te, 
+static void pvfs_search_timer(struct tevent_context *ev, struct tevent_timer *te, 
 				      struct timeval t, void *ptr)
 {
 	struct pvfs_search_state *search = talloc_get_type(ptr, struct pvfs_search_state);
@@ -58,7 +58,7 @@ static void pvfs_search_timer(struct event_context *ev, struct timed_event *te,
 */
 static void pvfs_search_setup_timer(struct pvfs_search_state *search)
 {
-	struct event_context *ev = search->pvfs->ntvfs->ctx->event_ctx;
+	struct tevent_context *ev = search->pvfs->ntvfs->ctx->event_ctx;
 	if (search->handle == INVALID_SEARCH_HANDLE) return;
 	talloc_free(search->te);
 	search->te = event_add_timed(ev, search, 
diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c
index c22a0c8792d..d396b94da14 100644
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -34,7 +34,7 @@ struct pvfs_wait {
 	void *private_data;
 	int msg_type;
 	struct messaging_context *msg_ctx;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct ntvfs_request *req;
 	enum pvfs_wait_notice reason;
 };
@@ -93,8 +93,8 @@ static void pvfs_wait_dispatch(struct messaging_context *msg,
 /*
   receive a timeout on a message wait
 */
-static void pvfs_wait_timeout(struct event_context *ev, 
-			      struct timed_event *te, struct timeval t,
+static void pvfs_wait_timeout(struct tevent_context *ev, 
+			      struct tevent_timer *te, struct timeval t,
 			      void *private_data)
 {
 	struct pvfs_wait *pwait = talloc_get_type(private_data,
diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c
index 2da0e4bb3af..ba505e61d7c 100644
--- a/source4/ntvfs/posix/pvfs_write.c
+++ b/source4/ntvfs/posix/pvfs_write.c
@@ -24,8 +24,8 @@
 #include "librpc/gen_ndr/security.h"
 #include "lib/events/events.h"
 
-static void pvfs_write_time_update_handler(struct event_context *ev,
-					   struct timed_event *te,
+static void pvfs_write_time_update_handler(struct tevent_context *ev,
+					   struct tevent_timer *te,
 					   struct timeval tv,
 					   void *private_data)
 {
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index 1a54b57d631..342d28325ee 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -174,7 +174,7 @@ struct pvfs_file_handle {
 
 	struct {
 		bool update_triggered;
-		struct timed_event *update_event;
+		struct tevent_timer *update_event;
 		bool update_on_close;
 		NTTIME close_time;
 		bool update_forced;
@@ -225,7 +225,7 @@ struct pvfs_search_state {
 	time_t last_used;
 	uint_t num_ea_names;
 	struct ea_name *ea_names;
-	struct timed_event *te;
+	struct tevent_timer *te;
 };
 
 /* flags to pvfs_resolve_name() */
diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c
index c47a1216c88..f7aa91dd0e1 100644
--- a/source4/ntvfs/sysdep/inotify.c
+++ b/source4/ntvfs/sysdep/inotify.c
@@ -198,7 +198,7 @@ static void inotify_dispatch(struct inotify_private *in,
 /*
   called when the kernel has some events for us
 */
-static void inotify_handler(struct event_context *ev, struct fd_event *fde,
+static void inotify_handler(struct tevent_context *ev, struct tevent_fd *fde,
 			    uint16_t flags, void *private_data)
 {
 	struct inotify_private *in = talloc_get_type(private_data,
diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c
index 64e993f395c..12fd83e8e0e 100644
--- a/source4/ntvfs/sysdep/sys_lease.c
+++ b/source4/ntvfs/sysdep/sys_lease.c
@@ -39,7 +39,7 @@ static uint32_t num_backends;
 */
 _PUBLIC_ struct sys_lease_context *sys_lease_context_create(struct share_config *scfg,
 							    TALLOC_CTX *mem_ctx,
-							    struct event_context *ev,
+							    struct tevent_context *ev,
 							    struct messaging_context *msg,
 							    sys_lease_send_break_fn break_send)
 {
diff --git a/source4/ntvfs/sysdep/sys_lease.h b/source4/ntvfs/sysdep/sys_lease.h
index 6cda6398b29..422797b0b89 100644
--- a/source4/ntvfs/sysdep/sys_lease.h
+++ b/source4/ntvfs/sysdep/sys_lease.h
@@ -22,7 +22,7 @@
 struct sys_lease_context;
 struct opendb_entry;
 struct messaging_context;
-struct event_context;
+struct tevent_context;
 
 typedef NTSTATUS (*sys_lease_send_break_fn)(struct messaging_context *,
 					    struct opendb_entry *,
@@ -40,7 +40,7 @@ struct sys_lease_ops {
 };
 
 struct sys_lease_context {
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 	struct messaging_context *msg_ctx;
 	sys_lease_send_break_fn break_send;
 	void *private_data; /* for use of backend */
@@ -52,7 +52,7 @@ NTSTATUS sys_lease_init(void);
 
 struct sys_lease_context *sys_lease_context_create(struct share_config *scfg,
 						   TALLOC_CTX *mem_ctx,
-						   struct event_context *ev,
+						   struct tevent_context *ev,
 						   struct messaging_context *msg_ctx,
 						   sys_lease_send_break_fn break_send);
 
diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index 117d16d20a6..57e921b2067 100644
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -40,7 +40,7 @@ static uint32_t num_backends;
 */
 _PUBLIC_ struct sys_notify_context *sys_notify_context_create(struct share_config *scfg,
 							      TALLOC_CTX *mem_ctx, 
-							      struct event_context *ev)
+							      struct tevent_context *ev)
 {
 	struct sys_notify_context *ctx;
 	const char *bname;
diff --git a/source4/ntvfs/sysdep/sys_notify.h b/source4/ntvfs/sysdep/sys_notify.h
index 63d4282e7ce..d912a9bdaf6 100644
--- a/source4/ntvfs/sysdep/sys_notify.h
+++ b/source4/ntvfs/sysdep/sys_notify.h
@@ -32,7 +32,7 @@ typedef NTSTATUS (*notify_watch_t)(struct sys_notify_context *ctx,
 				   void *handle_p);
 
 struct sys_notify_context {
-	struct event_context *ev;
+	struct tevent_context *ev;
 	void *private_data; /* for use of backend */
 	const char *name;
 	notify_watch_t notify_watch;
@@ -46,7 +46,7 @@ struct sys_notify_backend {
 NTSTATUS sys_notify_register(struct sys_notify_backend *backend);
 struct sys_notify_context *sys_notify_context_create(struct share_config *scfg,
 						     TALLOC_CTX *mem_ctx, 
-						     struct event_context *ev);
+						     struct tevent_context *ev);
 NTSTATUS sys_notify_watch(struct sys_notify_context *ctx, struct notify_entry *e,
 			  sys_notify_callback_t callback, void *private_data, 
 			  void *handle);