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, 10 insertions, 10 deletions

diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c
index 719b7fa5fc..8224d36b7d 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 b846845731..22aa297210 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 c22a0c8792..d396b94da1 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 2da0e4bb3a..ba505e61d7 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 1a54b57d63..342d28325e 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() */