From 5743277ed6297ce77afcdb7b336c8929c83af8a3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 09:58:40 +0100 Subject: [PATCH] s3:nmbd: s/struct event_context/struct tevent_context Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/include/event.h | 6 +++--- source3/nmbd/nmbd.c | 2 +- source3/nmbd/nmbd_processlogon.c | 2 +- source3/nmbd/nmbd_proto.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/include/event.h b/source3/include/event.h index 86af6fe4781..d5decaa669d 100644 --- a/source3/include/event.h +++ b/source3/include/event.h @@ -23,9 +23,9 @@ /* The following definitions come from lib/events.c */ struct pollfd; -struct timeval *get_timed_events_timeout(struct event_context *event_ctx, +struct timeval *get_timed_events_timeout(struct tevent_context *event_ctx, struct timeval *to_ret); -void dump_event_list(struct event_context *event_ctx); +void dump_event_list(struct tevent_context *event_ctx); struct tevent_context *s3_tevent_context_init(TALLOC_CTX *mem_ctx); bool event_add_to_poll_args(struct tevent_context *ev, TALLOC_CTX *mem_ctx, @@ -34,7 +34,7 @@ bool event_add_to_poll_args(struct tevent_context *ev, TALLOC_CTX *mem_ctx, bool run_events_poll(struct tevent_context *ev, int pollrtn, struct pollfd *pfds, int num_pfds); -struct idle_event *event_add_idle(struct event_context *event_ctx, +struct idle_event *event_add_idle(struct tevent_context *event_ctx, TALLOC_CTX *mem_ctx, struct timeval interval, const char *name, diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 49f0cdf4578..12afb009939 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -43,7 +43,7 @@ bool found_lm_clients = False; time_t StartupTime = 0; -struct event_context *nmbd_event_context(void) +struct tevent_context *nmbd_event_context(void) { return server_event_context(); } diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index ca77ebf1d2e..4dedb5fa5f7 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/source3/nmbd/nmbd_processlogon.c @@ -56,7 +56,7 @@ static bool delay_logon(const char *peer_name, const char *peer_addr) return list_match(delay_list, (const char *)peer, client_match); } -static void delayed_init_logon_handler(struct event_context *event_ctx, +static void delayed_init_logon_handler(struct tevent_context *event_ctx, struct timed_event *te, struct timeval now, void *private_data) diff --git a/source3/nmbd/nmbd_proto.h b/source3/nmbd/nmbd_proto.h index 59ad423f035..4bcf100d570 100644 --- a/source3/nmbd/nmbd_proto.h +++ b/source3/nmbd/nmbd_proto.h @@ -36,7 +36,7 @@ void kill_async_dns_child(void); /* The following definitions come from nmbd/nmbd.c */ -struct event_context *nmbd_event_context(void); +struct tevent_context *nmbd_event_context(void); /* The following definitions come from nmbd/nmbd_become_dmb.c */ -- 2.11.4.GIT