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

1 files changed, 4 insertions, 4 deletions

diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index 7d8ca49e9a..0c4420cd40 100644
--- a/libcli/nbt/libnbt.h
+++ b/libcli/nbt/libnbt.h
@@ -60,7 +60,7 @@ struct nbt_name_request {
 	bool received_wack;
 
 	/* the timeout event */
-	struct timed_event *te;
+	struct tevent_timer *te;
 
 	/* the name transaction id */
 	uint16_t name_trn_id;
@@ -94,14 +94,14 @@ struct nbt_name_request {
 */
 struct nbt_name_socket {
 	struct socket_context *sock;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 	struct smb_iconv_convenience *iconv_convenience;
 
 	/* a queue of requests pending to be sent */
 	struct nbt_name_request *send_queue;
 
 	/* the fd event */
-	struct fd_event *fde;
+	struct tevent_fd *fde;
 
 	/* mapping from name_trn_id to pending event */
 	struct idr_context *idr;
@@ -277,7 +277,7 @@ struct nbt_name_release {
 };
 
 struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
-					     struct event_context *event_ctx,
+					     struct tevent_context *event_ctx,
 					     struct smb_iconv_convenience *iconv_convenience);
 struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nbtsock,
 					     struct nbt_name_query *io);