From 415e8e0513017207c9c87ec968f22ed43bdb220b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 09:56:41 +0100 Subject: s3:smbd: s/struct event_context/struct tevent_context Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/include/smb.h | 2 +- source3/smbd/blocking.c | 2 +- source3/smbd/fileio.c | 2 +- source3/smbd/notify.c | 2 +- source3/smbd/notify_inotify.c | 2 +- source3/smbd/notify_internal.c | 2 +- source3/smbd/oplock.c | 2 +- source3/smbd/oplock_irix.c | 2 +- source3/smbd/process.c | 6 +++--- source3/smbd/proto.h | 8 ++++---- source3/smbd/server.c | 4 ++-- source3/smbd/smb2_create.c | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source3/include/smb.h b/source3/include/smb.h index a163e9e5ca..0d16e565e5 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -144,7 +144,7 @@ struct notify_event; struct notify_change_request; struct sys_notify_backend; struct sys_notify_context { - struct event_context *ev; + struct tevent_context *ev; void *private_data; /* For use by the system backend */ }; diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 95d6c330a0..1bef73b697 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -35,7 +35,7 @@ static void received_unlock_msg(struct messaging_context *msg, struct server_id server_id, DATA_BLOB *data); -void brl_timeout_fn(struct event_context *event_ctx, +void brl_timeout_fn(struct tevent_context *event_ctx, struct timed_event *te, struct timeval now, void *private_data) diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 631a9a1e0d..409924d384 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -164,7 +164,7 @@ static int wcp_file_size_change(files_struct *fsp) return ret; } -void update_write_time_handler(struct event_context *ctx, +void update_write_time_handler(struct tevent_context *ctx, struct timed_event *te, struct timeval now, void *private_data) diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c index 73e25b7c92..4842d6f2fc 100644 --- a/source3/smbd/notify.c +++ b/source3/smbd/notify.c @@ -570,7 +570,7 @@ char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter) } struct sys_notify_context *sys_notify_context_create(TALLOC_CTX *mem_ctx, - struct event_context *ev) + struct tevent_context *ev) { struct sys_notify_context *ctx; diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c index 7f463a156f..bfa41c9940 100644 --- a/source3/smbd/notify_inotify.c +++ b/source3/smbd/notify_inotify.c @@ -190,7 +190,7 @@ static void inotify_dispatch(struct inotify_private *in, /* called when the kernel has some events for us */ -static void inotify_handler(struct event_context *ev, struct fd_event *fde, +static void inotify_handler(struct tevent_context *ev, struct fd_event *fde, uint16_t flags, void *private_data) { struct inotify_private *in = talloc_get_type(private_data, diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c index 938c57b574..803e2d913e 100644 --- a/source3/smbd/notify_internal.c +++ b/source3/smbd/notify_internal.c @@ -121,7 +121,7 @@ static void notify_handler(struct messaging_context *msg_ctx, struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct messaging_context *msg, - struct event_context *ev) + struct tevent_context *ev) { struct loadparm_context *lp_ctx; struct notify_context *notify; diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 406ffd1e3d..6245817fd3 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -320,7 +320,7 @@ static files_struct *initial_break_processing( return fsp; } -static void oplock_timeout_handler(struct event_context *ctx, +static void oplock_timeout_handler(struct tevent_context *ctx, struct timed_event *te, struct timeval now, void *private_data) diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index aa987fccbb..ea439452c0 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/smbd/oplock_irix.c @@ -276,7 +276,7 @@ static void irix_release_kernel_oplock(struct kernel_oplocks *_ctx, } } -static void irix_oplocks_read_fde_handler(struct event_context *ev, +static void irix_oplocks_read_fde_handler(struct tevent_context *ev, struct fd_event *fde, uint16_t flags, void *private_data) diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 0d815f1885..73f68c02ec 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -581,7 +581,7 @@ static void process_smb(struct smbd_server_connection *conn, uint32_t seqnum, bool encrypted, struct smb_perfcount_data *deferred_pcd); -static void smbd_deferred_open_timer(struct event_context *ev, +static void smbd_deferred_open_timer(struct tevent_context *ev, struct timed_event *te, struct timeval _tval, void *private_data) @@ -2428,7 +2428,7 @@ process: seqnum, encrypted, NULL); } -static void smbd_server_connection_handler(struct event_context *ev, +static void smbd_server_connection_handler(struct tevent_context *ev, struct fd_event *fde, uint16_t flags, void *private_data) @@ -2446,7 +2446,7 @@ static void smbd_server_connection_handler(struct event_context *ev, } } -static void smbd_server_echo_handler(struct event_context *ev, +static void smbd_server_echo_handler(struct tevent_context *ev, struct fd_event *fde, uint16_t flags, void *private_data) diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 603114ecc9..6588f30e95 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -92,7 +92,7 @@ bool cancel_smb2_aio(struct smb_request *smbreq); /* The following definitions come from smbd/blocking.c */ -void brl_timeout_fn(struct event_context *event_ctx, +void brl_timeout_fn(struct tevent_context *event_ctx, struct timed_event *te, struct timeval now, void *private_data); @@ -314,7 +314,7 @@ NTSTATUS can_set_delete_on_close(files_struct *fsp, uint32 dosmode); /* The following definitions come from smbd/fileio.c */ ssize_t read_file(files_struct *fsp,char *data,off_t pos,size_t n); -void update_write_time_handler(struct event_context *ctx, +void update_write_time_handler(struct tevent_context *ctx, struct timed_event *te, struct timeval now, void *private_data); @@ -534,7 +534,7 @@ void notify_fname(connection_struct *conn, uint32 action, uint32 filter, const char *path); char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter); struct sys_notify_context *sys_notify_context_create(TALLOC_CTX *mem_ctx, - struct event_context *ev); + struct tevent_context *ev); /* The following definitions come from smbd/notify_inotify.c */ @@ -552,7 +552,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx, struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct messaging_context *messaging_ctx, - struct event_context *ev); + struct tevent_context *ev); NTSTATUS notify_add(struct notify_context *notify, const char *path, uint32_t filter, uint32_t subdir_filter, void (*callback)(void *, const struct notify_event *), diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 57fe7b6455..b8c876750d 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -80,7 +80,7 @@ struct smbd_child_pid { extern void start_epmd(struct tevent_context *ev_ctx, struct messaging_context *msg_ctx); -extern void start_lsasd(struct event_context *ev_ctx, +extern void start_lsasd(struct tevent_context *ev_ctx, struct messaging_context *msg_ctx); #ifdef WITH_DFS @@ -394,7 +394,7 @@ static void add_child_pid(struct smbd_parent_context *parent, network outage). */ -static void cleanup_timeout_fn(struct event_context *event_ctx, +static void cleanup_timeout_fn(struct tevent_context *event_ctx, struct timed_event *te, struct timeval now, void *private_data) diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 21f25494c7..3fe901d2a2 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -1343,7 +1343,7 @@ bool schedule_deferred_open_message_smb2( Re-process this call. *********************************************************/ -static void smb2_deferred_open_timer(struct event_context *ev, +static void smb2_deferred_open_timer(struct tevent_context *ev, struct timed_event *te, struct timeval _tval, void *private_data) -- cgit