summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-02-18 09:59:08 +0100
committerMichael Adam <obnox@samba.org>2013-02-19 23:47:53 +0100
commit00b1ef8853a0ad3bf967f98d5a9a570109abb82e (patch)
tree567503dff517353f153b86559a3fc65828b0b684
parent5743277ed6297ce77afcdb7b336c8929c83af8a3 (diff)
downloadsamba-00b1ef8853a0ad3bf967f98d5a9a570109abb82e.tar.gz
samba-00b1ef8853a0ad3bf967f98d5a9a570109abb82e.tar.bz2
samba-00b1ef8853a0ad3bf967f98d5a9a570109abb82e.zip
s3:modules: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/modules/vfs_aio_fork.c2
-rw-r--r--source3/modules/vfs_aio_linux.c4
-rw-r--r--source3/modules/vfs_aio_pthread.c6
-rw-r--r--source3/modules/vfs_notify_fam.c8
-rw-r--r--source3/modules/vfs_preopen.c2
5 files changed, 11 insertions, 11 deletions
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 3db336f9d5..4f6574bb47 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -256,7 +256,7 @@ static ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd)
return (sendmsg(fd, &msg, 0));
}
-static void aio_child_cleanup(struct event_context *event_ctx,
+static void aio_child_cleanup(struct tevent_context *event_ctx,
struct timed_event *te,
struct timeval now,
void *private_data)
diff --git a/source3/modules/vfs_aio_linux.c b/source3/modules/vfs_aio_linux.c
index 4ccdd8fb7e..a8bc679703 100644
--- a/source3/modules/vfs_aio_linux.c
+++ b/source3/modules/vfs_aio_linux.c
@@ -33,7 +33,7 @@ static struct fd_event *aio_read_event;
static bool used;
static unsigned num_busy;
-static void aio_linux_done(struct event_context *event_ctx,
+static void aio_linux_done(struct tevent_context *event_ctx,
struct fd_event *event,
uint16 flags, void *private_data);
@@ -246,7 +246,7 @@ static struct tevent_req *aio_linux_fsync_send(
return req;
}
-static void aio_linux_done(struct event_context *event_ctx,
+static void aio_linux_done(struct tevent_context *event_ctx,
struct fd_event *event,
uint16 flags, void *private_data)
{
diff --git a/source3/modules/vfs_aio_pthread.c b/source3/modules/vfs_aio_pthread.c
index 6edb12d95e..aa10921a3d 100644
--- a/source3/modules/vfs_aio_pthread.c
+++ b/source3/modules/vfs_aio_pthread.c
@@ -37,9 +37,9 @@
Ensure thread pool is initialized.
***********************************************************************/
-static bool init_aio_threadpool(struct event_context *ev_ctx,
+static bool init_aio_threadpool(struct tevent_context *ev_ctx,
struct pthreadpool **pp_pool,
- void (*completion_fn)(struct event_context *,
+ void (*completion_fn)(struct tevent_context *,
struct fd_event *,
uint16,
void *))
@@ -150,7 +150,7 @@ static struct aio_open_private_data *find_open_private_data_by_mid(uint64_t mid)
Callback when an open completes.
***********************************************************************/
-static void aio_open_handle_completion(struct event_context *event_ctx,
+static void aio_open_handle_completion(struct tevent_context *event_ctx,
struct fd_event *event,
uint16 flags,
void *p)
diff --git a/source3/modules/vfs_notify_fam.c b/source3/modules/vfs_notify_fam.c
index dcc843f6d8..c456cadd26 100644
--- a/source3/modules/vfs_notify_fam.c
+++ b/source3/modules/vfs_notify_fam.c
@@ -67,13 +67,13 @@ static FAMConnection fam_connection;
static bool fam_connection_initialized = False;
static struct fam_watch_context *fam_notify_list;
-static void fam_handler(struct event_context *event_ctx,
+static void fam_handler(struct tevent_context *event_ctx,
struct fd_event *fd_event,
uint16 flags,
void *private_data);
static NTSTATUS fam_open_connection(FAMConnection *fam_conn,
- struct event_context *event_ctx)
+ struct tevent_context *event_ctx)
{
int res;
char *name;
@@ -127,7 +127,7 @@ static NTSTATUS fam_open_connection(FAMConnection *fam_conn,
}
static void fam_reopen(FAMConnection *fam_conn,
- struct event_context *event_ctx,
+ struct tevent_context *event_ctx,
struct fam_watch_context *notify_list)
{
struct fam_watch_context *ctx;
@@ -146,7 +146,7 @@ static void fam_reopen(FAMConnection *fam_conn,
}
}
-static void fam_handler(struct event_context *event_ctx,
+static void fam_handler(struct tevent_context *event_ctx,
struct fd_event *fd_event,
uint16 flags,
void *private_data)
diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c
index 108ca29088..4aae77d613 100644
--- a/source3/modules/vfs_preopen.c
+++ b/source3/modules/vfs_preopen.c
@@ -106,7 +106,7 @@ static void preopen_queue_run(struct preopen_state *state)
}
}
-static void preopen_helper_readable(struct event_context *ev,
+static void preopen_helper_readable(struct tevent_context *ev,
struct fd_event *fde, uint16_t flags,
void *priv)
{