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

4 files changed, 13 insertions, 13 deletions

diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 1fbbfe3581..b9e83218dd 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -50,7 +50,7 @@ struct composite_context *smbcli_sock_connect_send(TALLOC_CTX *mem_ctx,
 						   const char **ports,
 						   const char *host_name,
 						   struct resolve_context *resolve_ctx,
-						   struct event_context *event_ctx,
+						   struct tevent_context *event_ctx,
 						   const char *socket_options)
 {
 	struct composite_context *result, *ctx;
@@ -153,7 +153,7 @@ NTSTATUS smbcli_sock_connect(TALLOC_CTX *mem_ctx,
 			     const char *host_addr, const char **ports,
 			     const char *host_name,
 			     struct resolve_context *resolve_ctx,
-			     struct event_context *event_ctx,
+			     struct tevent_context *event_ctx,
 				 const char *socket_options,
 			     struct smbcli_socket **result)
 {
@@ -190,7 +190,7 @@ resolve a hostname and connect
 _PUBLIC_ struct smbcli_socket *smbcli_sock_connect_byname(const char *host, const char **ports,
 						 TALLOC_CTX *mem_ctx,
 						 struct resolve_context *resolve_ctx,
-						 struct event_context *event_ctx,
+						 struct tevent_context *event_ctx,
 						 const char *socket_options)
 {
 	int name_type = NBT_NAME_SERVER;
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 502ecc1825..22e2552edc 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -33,8 +33,8 @@
 /*
   an event has happened on the socket
 */
-static void smbcli_transport_event_handler(struct event_context *ev, 
-					   struct fd_event *fde, 
+static void smbcli_transport_event_handler(struct tevent_context *ev, 
+					   struct tevent_fd *fde, 
 					   uint16_t flags, void *private)
 {
 	struct smbcli_transport *transport = talloc_get_type(private,
@@ -307,8 +307,8 @@ again:
 	return mid;
 }
 
-static void idle_handler(struct event_context *ev, 
-			 struct timed_event *te, struct timeval t, void *private)
+static void idle_handler(struct tevent_context *ev, 
+			 struct tevent_timer *te, struct timeval t, void *private)
 {
 	struct smbcli_transport *transport = talloc_get_type(private,
 							     struct smbcli_transport);
@@ -541,7 +541,7 @@ _PUBLIC_ bool smbcli_transport_process(struct smbcli_transport *transport)
 /*
   handle timeouts of individual smb requests
 */
-static void smbcli_timeout_handler(struct event_context *ev, struct timed_event *te, 
+static void smbcli_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
 				   struct timeval t, void *private)
 {
 	struct smbcli_request *req = talloc_get_type(private, struct smbcli_request);
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 984aa70247..a083396f35 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -176,7 +176,7 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 					 const char *socket_options,
 				     struct cli_credentials *credentials,
 				     struct resolve_context *resolve_ctx,
-				     struct event_context *ev,
+				     struct tevent_context *ev,
 				     struct smbcli_options *options,
 				     struct smbcli_session_options *session_options,
 					 struct smb_iconv_convenience *iconv_convenience,
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 7757d10099..0ab6f5650c 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -81,9 +81,9 @@ struct smbcli_socket {
 
 	/* the event handle for waiting for socket IO */
 	struct {
-		struct event_context *ctx;
-		struct fd_event *fde;
-		struct timed_event *te;
+		struct tevent_context *ctx;
+		struct tevent_fd *fde;
+		struct tevent_timer *te;
 	} event;
 };
 
@@ -377,7 +377,7 @@ NTSTATUS smb_raw_trans(struct smbcli_tree *tree,
 struct smbcli_socket *smbcli_sock_connect_byname(const char *host, const char **ports,
 						 TALLOC_CTX *mem_ctx,
 						 struct resolve_context *resolve_ctx,
-						 struct event_context *event_ctx,
+						 struct tevent_context *event_ctx,
 						 const char *socket_options);
 void smbcli_sock_dead(struct smbcli_socket *sock);