From 183c379fe58ca60f5ef2d1f2033d035d4117ac8f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 29 Dec 2008 20:24:57 +0100 Subject: 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 --- source4/libcli/dgram/dgramsocket.c | 4 ++-- source4/libcli/dgram/libdgram.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/libcli/dgram') diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c index 9d00623081..5c878f19fa 100644 --- a/source4/libcli/dgram/dgramsocket.c +++ b/source4/libcli/dgram/dgramsocket.c @@ -139,7 +139,7 @@ static void dgm_socket_send(struct nbt_dgram_socket *dgmsock) /* handle fd events on a nbt_dgram_socket */ -static void dgm_socket_handler(struct event_context *ev, struct fd_event *fde, +static void dgm_socket_handler(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *private) { struct nbt_dgram_socket *dgmsock = talloc_get_type(private, @@ -157,7 +157,7 @@ static void dgm_socket_handler(struct event_context *ev, struct fd_event *fde, then operations will use that event context */ struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct smb_iconv_convenience *iconv_convenience) { struct nbt_dgram_socket *dgmsock; diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h index 2f8feb5345..8060d8cf53 100644 --- a/source4/libcli/dgram/libdgram.h +++ b/source4/libcli/dgram/libdgram.h @@ -39,11 +39,11 @@ struct nbt_dgram_request { */ struct nbt_dgram_socket { struct socket_context *sock; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct smb_iconv_convenience *iconv_convenience; /* the fd event */ - struct fd_event *fde; + struct tevent_fd *fde; /* a queue of outgoing requests */ struct nbt_dgram_request *send_queue; @@ -93,7 +93,7 @@ NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock, struct socket_address *), void *private); struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct smb_iconv_convenience *); const char *dgram_mailslot_name(struct nbt_dgram_packet *packet); -- cgit