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

13 files changed, 41 insertions, 41 deletions

diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index f11b90f448..23844a2c85 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -808,7 +808,7 @@ static struct composite_context *torture_connect_async(
 				struct torture_context *tctx,
 				struct smb_composite_connect *smb,
 				TALLOC_CTX *mem_ctx,
-				struct event_context *ev,
+				struct tevent_context *ev,
 				const char *host,
 				const char *share,
 				const char *workgroup)
@@ -839,7 +839,7 @@ bool run_benchrw(struct torture_context *tctx)
 	struct smbcli_request *req;
 	struct benchrw_state **state;
 	int i , num_unc_names;
-	struct event_context 	*ev	;	
+	struct tevent_context 	*ev	;	
 	struct composite_context *req1;
 	struct params lpparams;
 	union smb_mkdir parms;
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 02eecd7f40..0677d9ac8e 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -183,7 +183,7 @@ static bool connect_servers_fast(void)
 /***************************************************** 
 connect to the servers
 *******************************************************/
-static bool connect_servers(struct event_context *ev,
+static bool connect_servers(struct tevent_context *ev,
 			    struct loadparm_context *lp_ctx)
 {
 	int i, j;
@@ -2889,7 +2889,7 @@ static struct {
   run the test with the current set of op_parms parameters
   return the number of operations that completed successfully
 */
-static int run_test(struct event_context *ev, struct loadparm_context *lp_ctx)
+static int run_test(struct tevent_context *ev, struct loadparm_context *lp_ctx)
 {
 	int op, i;
 
@@ -2970,7 +2970,7 @@ static int run_test(struct event_context *ev, struct loadparm_context *lp_ctx)
    perform a backtracking analysis of the minimal set of operations
    to generate an error
 */
-static void backtrack_analyze(struct event_context *ev,
+static void backtrack_analyze(struct tevent_context *ev,
 			      struct loadparm_context *lp_ctx)
 {
 	int chunk, ret;
@@ -3038,7 +3038,7 @@ static void backtrack_analyze(struct event_context *ev,
 /* 
    start the main gentest process
 */
-static bool start_gentest(struct event_context *ev,
+static bool start_gentest(struct tevent_context *ev,
 			  struct loadparm_context *lp_ctx)
 {
 	int op;
@@ -3130,7 +3130,7 @@ static bool split_unc_name(const char *unc, char **server, char **share)
 	int i, username_count=0;
 	bool ret;
 	char *ignore_file=NULL;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct loadparm_context *lp_ctx;
 	poptContext pc;
 	int argc_new;
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 18c4156cc3..0a937e9638 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -107,7 +107,7 @@ static struct record *recorded;
 /***************************************************** 
 return a connection to a server
 *******************************************************/
-static struct smbcli_state *connect_one(struct event_context *ev,
+static struct smbcli_state *connect_one(struct tevent_context *ev,
 					struct loadparm_context *lp_ctx,
 					TALLOC_CTX *mem_ctx,
 					char *share, int snum, int conn)
@@ -183,7 +183,7 @@ static struct smbcli_state *connect_one(struct event_context *ev,
 }
 
 
-static void reconnect(struct event_context *ev,
+static void reconnect(struct tevent_context *ev,
 		      struct loadparm_context *lp_ctx,
 			  TALLOC_CTX *mem_ctx,
 		      struct smbcli_state *cli[NSERVERS][NCONNECTIONS], int fnum[NSERVERS][NCONNECTIONS][NFILES],
@@ -405,7 +405,7 @@ static int retest(struct smbcli_state *cli[NSERVERS][NCONNECTIONS],
    we then do random locking ops in tamdem on the 4 fnums from each
    server and ensure that the results match
  */
-static int test_locks(struct event_context *ev,
+static int test_locks(struct tevent_context *ev,
 		      struct loadparm_context *lp_ctx,
 			  TALLOC_CTX *mem_ctx,
 		      char *share[NSERVERS])
@@ -555,7 +555,7 @@ static void usage(poptContext pc)
 	int opt;
 	int seed, server;
 	int username_count=0;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct loadparm_context *lp_ctx;
 	poptContext pc;
 	int argc_new, i;
diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c
index cb435c7b55..40b0085881 100644
--- a/source4/torture/locktest2.c
+++ b/source4/torture/locktest2.c
@@ -145,7 +145,7 @@ static struct smbcli_state *connect_one(TALLOC_CTX *mem_ctx,
 					struct smb_options *options,
 					struct smb_options *session_options,
 					struct gensec_settings *gensec_settings,
-					struct event_context *ev)
+					struct tevent_context *ev)
 {
 	struct smbcli_state *c;
 	char *server_n;
@@ -194,7 +194,7 @@ static void reconnect(TALLOC_CTX *mem_ctx,
 		      struct smbcli_options *options,
 		      struct smbcli_session_options *session_options,
 			  struct gensec_settings *gensec_settings,
-		      struct event_context *ev,
+		      struct tevent_context *ev,
 		      char *share1, char *share2)
 {
 	int server, conn, f, fstype;
@@ -365,7 +365,7 @@ static void test_locks(TALLOC_CTX *mem_ctx, char *share1, char *share2,
 			struct smbcli_options *options,
 			struct smbcli_session_options *session_options,
 			struct gensec_settings *gensec_settings,
-			struct event_context *ev)
+			struct tevent_context *ev)
 {
 	struct smbcli_state *cli[NSERVERS][NCONNECTIONS];
 	char *nfs[NSERVERS];
@@ -486,7 +486,7 @@ static void usage(void)
 	char *p;
 	int seed;
 	struct loadparm_context *lp_ctx;
-	struct event_context *ev;
+	struct tevent_context *ev;
 
 	mem_ctx = talloc_autofree_context();
 
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 9ff790c2b0..7b0251d159 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -73,7 +73,7 @@ static char *reg_test(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char
 return a connection to a server
 *******************************************************/
 static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx, 
-					struct event_context *ev,
+					struct tevent_context *ev,
 					TALLOC_CTX *mem_ctx,
 					char *share, const char **ports,
 					const char *socket_options,
@@ -298,7 +298,7 @@ static void usage(poptContext pc)
 	struct smbcli_state *cli;	
 	int opt;
 	int seed;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct loadparm_context *lp_ctx;
 	struct smbcli_options options;
 	struct smbcli_session_options session_options;
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 79ae41dafb..49564dc1ad 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -133,7 +133,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct
 	int i;
 	size_t len = random() % 10000;
 	extern int torture_numops;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 	int *count = talloc_zero(tctx, int);
 	bool ret = true;
 
@@ -225,7 +225,7 @@ static bool test_appendacl(struct smbcli_state *cli, struct torture_context *tct
 	struct smb_composite_appendacl **io;
 	struct smb_composite_appendacl **io_orig;
 	struct composite_context **c;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 
 	struct security_descriptor *test_sd;
 	struct security_ace *ace;
@@ -342,7 +342,7 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx)
 
 	int i;
 	extern int torture_numops;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 	int *count = talloc_zero(tctx, int);
 	bool ret = true;
 
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index dce21ebe71..4077ae97e6 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -45,7 +45,7 @@ enum lock_stage {LOCK_INITIAL, LOCK_LOCK, LOCK_UNLOCK};
 
 struct benchlock_state {
 	struct torture_context *tctx;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct smbcli_tree *tree;
 	TALLOC_CTX *mem_ctx;
 	int client_num;
@@ -57,7 +57,7 @@ struct benchlock_state {
 	int lastcount;
 	struct smbcli_request *req;
 	struct smb_composite_connect reconnect;
-	struct timed_event *te;
+	struct tevent_timer *te;
 
 	/* these are used for reconnections */
 	const char **dest_ports;
@@ -116,11 +116,11 @@ static void lock_send(struct benchlock_state *state)
 	state->req->async.fn      = lock_completion;
 }
 
-static void reopen_connection(struct event_context *ev, struct timed_event *te, 
+static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te, 
 			      struct timeval t, void *private_data);
 
 
-static void reopen_file(struct event_context *ev, struct timed_event *te, 
+static void reopen_file(struct tevent_context *ev, struct tevent_timer *te, 
 				      struct timeval t, void *private_data)
 {
 	struct benchlock_state *state = (struct benchlock_state *)private_data;
@@ -171,7 +171,7 @@ static void reopen_connection_complete(struct composite_context *ctx)
 /*
   reopen a connection
  */
-static void reopen_connection(struct event_context *ev, struct timed_event *te, 
+static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te, 
 			      struct timeval t, void *private_data)
 {
 	struct benchlock_state *state = (struct benchlock_state *)private_data;
@@ -277,7 +277,7 @@ static void echo_completion(struct smbcli_request *req)
 	}
 }
 
-static void report_rate(struct event_context *ev, struct timed_event *te, 
+static void report_rate(struct tevent_context *ev, struct tevent_timer *te, 
 			struct timeval t, void *private_data)
 {
 	struct benchlock_state *state = talloc_get_type(private_data, 
diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c
index 34d87f1623..2d97efa049 100644
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -54,7 +54,7 @@ static double worst_latencies[OP_ENDOFLIST];
 
 struct offline_state {
 	struct torture_context *tctx;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct smbcli_tree *tree;
 	TALLOC_CTX *mem_ctx;
 	int client;
@@ -330,7 +330,7 @@ static void echo_completion(struct smbcli_request *req)
 	}
 }
 
-static void report_rate(struct event_context *ev, struct timed_event *te, 
+static void report_rate(struct tevent_context *ev, struct tevent_timer *te, 
 			struct timeval t, void *private_data)
 {
 	struct offline_state *state = talloc_get_type(private_data, 
diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index 2440649e7f..a9ce4aec0d 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -41,12 +41,12 @@ static int open_failed;
 static int close_failed;
 static char **fnames;
 static int num_connected;
-static struct timed_event *report_te;
+static struct tevent_timer *report_te;
 
 struct benchopen_state {
 	struct torture_context *tctx;
 	TALLOC_CTX *mem_ctx;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct smbcli_state *cli;
 	struct smbcli_tree *tree;
 	int client_num;
@@ -64,7 +64,7 @@ struct benchopen_state {
 	struct smbcli_request *req_open;
 	struct smbcli_request *req_close;
 	struct smb_composite_connect reconnect;
-	struct timed_event *te;
+	struct tevent_timer *te;
 
 	/* these are used for reconnections */
 	const char **dest_ports;
@@ -74,7 +74,7 @@ struct benchopen_state {
 };
 
 static void next_open(struct benchopen_state *state);
-static void reopen_connection(struct event_context *ev, struct timed_event *te, 
+static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te, 
 			      struct timeval t, void *private_data);
 
 
@@ -113,7 +113,7 @@ static void reopen_connection_complete(struct composite_context *ctx)
 /*
   reopen a connection
  */
-static void reopen_connection(struct event_context *ev, struct timed_event *te, 
+static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te, 
 			      struct timeval t, void *private_data)
 {
 	struct benchopen_state *state = (struct benchopen_state *)private_data;
@@ -328,7 +328,7 @@ static void echo_completion(struct smbcli_request *req)
 	}
 }
 
-static void report_rate(struct event_context *ev, struct timed_event *te, 
+static void report_rate(struct tevent_context *ev, struct tevent_timer *te, 
 			struct timeval t, void *private_data)
 {
 	struct benchopen_state *state = talloc_get_type(private_data, 
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index f0afee26cc..d31d841e13 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -3036,8 +3036,8 @@ static bool oplock_handler_hold(struct smbcli_transport *transport,
 bool torture_hold_oplock(struct torture_context *torture, 
 			 struct smbcli_state *cli)
 {
-	struct event_context *ev = 
-		(struct event_context *)cli->transport->socket->event.ctx;
+	struct tevent_context *ev = 
+		(struct tevent_context *)cli->transport->socket->event.ctx;
 	int i;
 
 	printf("Setting up open files with oplocks in %s\n", BASEDIR);
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 5c027d3299..840ce5485c 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -234,7 +234,7 @@ static bool test_sleep(struct torture_context *tctx,
 	struct timeval snd[ASYNC_COUNT];
 	struct timeval rcv[ASYNC_COUNT];
 	struct timeval diff[ASYNC_COUNT];
-	struct event_context *ctx;
+	struct tevent_context *ctx;
 	int total_done = 0;
 
 	if (torture_setting_bool(tctx, "quick", false)) {
diff --git a/source4/torture/util.h b/source4/torture/util.h
index 3609cca7d9..6a8ae36baf 100644
--- a/source4/torture/util.h
+++ b/source4/torture/util.h
@@ -56,7 +56,7 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
 				   struct torture_context *tctx,
 				   const char *hostname, 
 				   const char *sharename,
-				   struct event_context *ev);
+				   struct tevent_context *ev);
 _PUBLIC_ bool torture_get_conn_index(int conn_index,
 				     TALLOC_CTX *mem_ctx,
 				     struct torture_context *tctx,
@@ -64,7 +64,7 @@ _PUBLIC_ bool torture_get_conn_index(int conn_index,
 _PUBLIC_ bool torture_open_connection_ev(struct smbcli_state **c,
 					 int conn_index,
 					 struct torture_context *tctx,
-					 struct event_context *ev);
+					 struct tevent_context *ev);
 _PUBLIC_ bool torture_open_connection(struct smbcli_state **c, struct torture_context *tctx, int conn_index);
 _PUBLIC_ bool torture_close_connection(struct smbcli_state *c);
 _PUBLIC_ bool check_error(const char *location, struct smbcli_state *c, 
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index ae051b9735..f88a641059 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -470,7 +470,7 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
 				   struct torture_context *tctx,
 				   const char *hostname, 
 				   const char *sharename,
-				   struct event_context *ev)
+				   struct tevent_context *ev)
 {
 	NTSTATUS status;
 
@@ -539,7 +539,7 @@ _PUBLIC_ bool torture_get_conn_index(int conn_index,
 _PUBLIC_ bool torture_open_connection_ev(struct smbcli_state **c,
 					 int conn_index,
 					 struct torture_context *tctx,
-					 struct event_context *ev)
+					 struct tevent_context *ev)
 {
 	char *host, *share;
 	bool ret;