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/nbt_server/wins/winsclient.c | 6 +++--- source4/nbt_server/wins/winsdb.c | 4 ++-- source4/nbt_server/wins/winsdb.h | 2 +- source4/nbt_server/wins/winsserver.h | 2 +- source4/nbt_server/wins/winswack.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source4/nbt_server/wins') diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c index 133592f1fd..2546a26279 100644 --- a/source4/nbt_server/wins/winsclient.c +++ b/source4/nbt_server/wins/winsclient.c @@ -39,13 +39,13 @@ static struct nbt_name_socket *wins_socket(struct nbtd_interface *iface) } -static void nbtd_wins_refresh(struct event_context *ev, struct timed_event *te, +static void nbtd_wins_refresh(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data); /* retry a WINS name registration */ -static void nbtd_wins_register_retry(struct event_context *ev, struct timed_event *te, +static void nbtd_wins_register_retry(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct nbtd_iface_name *iname = talloc_get_type(private_data, struct nbtd_iface_name); @@ -129,7 +129,7 @@ static void nbtd_wins_refresh_handler(struct composite_context *c) /* refresh a WINS name registration */ -static void nbtd_wins_refresh(struct event_context *ev, struct timed_event *te, +static void nbtd_wins_refresh(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct nbtd_iface_name *iname = talloc_get_type(private_data, struct nbtd_iface_name); diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c index 283cd1219a..945914ccdf 100644 --- a/source4/nbt_server/wins/winsdb.c +++ b/source4/nbt_server/wins/winsdb.c @@ -937,7 +937,7 @@ failed: return NBT_RCODE_SVR; } -static bool winsdb_check_or_add_module_list(struct event_context *ev_ctx, +static bool winsdb_check_or_add_module_list(struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct winsdb_handle *h) { int trans; @@ -1003,7 +1003,7 @@ failed: } struct winsdb_handle *winsdb_connect(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *owner, enum winsdb_handle_caller caller) diff --git a/source4/nbt_server/wins/winsdb.h b/source4/nbt_server/wins/winsdb.h index 52906be77f..194bcc027e 100644 --- a/source4/nbt_server/wins/winsdb.h +++ b/source4/nbt_server/wins/winsdb.h @@ -77,5 +77,5 @@ enum wins_hook_action { }; struct ldb_message; -struct event_context; +struct tevent_context; #include "nbt_server/wins/winsdb_proto.h" diff --git a/source4/nbt_server/wins/winsserver.h b/source4/nbt_server/wins/winsserver.h index edb924c1e3..9f03557237 100644 --- a/source4/nbt_server/wins/winsserver.h +++ b/source4/nbt_server/wins/winsserver.h @@ -52,7 +52,7 @@ struct wins_challenge_io { struct { struct nbtd_server *nbtd_server; uint16_t nbt_port; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct nbt_name *name; uint32_t num_addresses; const char **addresses; diff --git a/source4/nbt_server/wins/winswack.c b/source4/nbt_server/wins/winswack.c index 7e0c73a810..c499889f9e 100644 --- a/source4/nbt_server/wins/winswack.c +++ b/source4/nbt_server/wins/winswack.c @@ -134,7 +134,7 @@ failed: struct wins_release_demand_io { struct { struct nbtd_server *nbtd_server; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct nbt_name *name; uint16_t nb_flags; uint32_t num_addresses; -- cgit