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/param/secrets.c | 4 ++-- source4/param/secrets.h | 6 +++--- source4/param/share.c | 2 +- source4/param/share.h | 4 ++-- source4/param/share_classic.c | 2 +- source4/param/share_ldb.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/param') diff --git a/source4/param/secrets.c b/source4/param/secrets.c index 576df0a4fe..6c6f7c28f0 100644 --- a/source4/param/secrets.c +++ b/source4/param/secrets.c @@ -86,7 +86,7 @@ struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_c connect to the secrets ldb */ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { char *path; @@ -129,7 +129,7 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, * @return pointer to a SID object if the SID could be obtained, NULL otherwise */ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain) { diff --git a/source4/param/secrets.h b/source4/param/secrets.h index 558a796967..743cf684a9 100644 --- a/source4/param/secrets.h +++ b/source4/param/secrets.h @@ -37,10 +37,10 @@ * @note Not called by systems with a working /dev/urandom. */ struct loadparm_context; -struct event_context; +struct tevent_context; struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); -struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, struct loadparm_context *lp_ctx); -struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain); +struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx); +struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain); #endif /* _SECRETS_H */ diff --git a/source4/param/share.c b/source4/param/share.c index 47aea55751..13d591ec1b 100644 --- a/source4/param/share.c +++ b/source4/param/share.c @@ -126,7 +126,7 @@ NTSTATUS share_register(const struct share_ops *ops) } NTSTATUS share_get_context_by_name(TALLOC_CTX *mem_ctx, const char *backend_name, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, struct share_context **ctx) { diff --git a/source4/param/share.h b/source4/param/share.h index 2a85fd4fbb..755d19e337 100644 --- a/source4/param/share.h +++ b/source4/param/share.h @@ -47,11 +47,11 @@ struct share_info { void *value; }; -struct event_context; +struct tevent_context; struct share_ops { const char *name; - NTSTATUS (*init)(TALLOC_CTX *, const struct share_ops*, struct event_context *ev_ctx, + NTSTATUS (*init)(TALLOC_CTX *, const struct share_ops*, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct share_context **); const char *(*string_option)(struct share_config *, const char *, const char *); diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c index bac1aac2d7..d732372f45 100644 --- a/source4/param/share_classic.c +++ b/source4/param/share_classic.c @@ -25,7 +25,7 @@ static NTSTATUS sclassic_init(TALLOC_CTX *mem_ctx, const struct share_ops *ops, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, struct share_context **ctx) { diff --git a/source4/param/share_ldb.c b/source4/param/share_ldb.c index 29664c7177..0944ba30fc 100644 --- a/source4/param/share_ldb.c +++ b/source4/param/share_ldb.c @@ -28,7 +28,7 @@ #include "param/param.h" static NTSTATUS sldb_init(TALLOC_CTX *mem_ctx, const struct share_ops *ops, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct share_context **ctx) { -- cgit