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/composite/composite.c | 4 ++-- source4/libcli/composite/composite.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/libcli/composite') diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c index 104397fa48..aff8f79481 100644 --- a/source4/libcli/composite/composite.c +++ b/source4/libcli/composite/composite.c @@ -35,7 +35,7 @@ and initialize it */ _PUBLIC_ struct composite_context *composite_create(TALLOC_CTX *mem_ctx, - struct event_context *ev) + struct tevent_context *ev) { struct composite_context *c; @@ -93,7 +93,7 @@ _PUBLIC_ NTSTATUS composite_wait_free(struct composite_context *c) and allows the caller to ignore the fact that the composite function completed early */ -static void composite_trigger(struct event_context *ev, struct timed_event *te, +static void composite_trigger(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *ptr) { struct composite_context *c = talloc_get_type(ptr, struct composite_context); diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h index 25799d6a94..a99a762c5f 100644 --- a/source4/libcli/composite/composite.h +++ b/source4/libcli/composite/composite.h @@ -24,7 +24,7 @@ #include "libcli/raw/interfaces.h" -struct event_context; +struct tevent_context; /* this defines the structures associated with "composite" @@ -56,7 +56,7 @@ struct composite_context { NTSTATUS status; /* the event context we are using */ - struct event_context *event_ctx; + struct tevent_context *event_ctx; /* information on what to do on completion */ struct { @@ -73,7 +73,7 @@ struct smb2_request; struct rpc_request; struct nbt_name_request; -struct composite_context *composite_create(TALLOC_CTX *mem_ctx, struct event_context *ev); +struct composite_context *composite_create(TALLOC_CTX *mem_ctx, struct tevent_context *ev); bool composite_nomem(const void *p, struct composite_context *ctx); void composite_continue(struct composite_context *ctx, struct composite_context *new_ctx, -- cgit