summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-05-25 15:28:10 -0400
committerSimo Sorce <idra@samba.org>2011-08-13 09:54:16 -0400
commitedc32665d0f5cfd5d86f975c8ac8e8ff100956f7 (patch)
treefc19257ea160b30712e2907dbb30c8ffce21922c
parentb1feb9d4324dfca7190ec3816d43392b65a94671 (diff)
downloadsamba-edc32665d0f5cfd5d86f975c8ac8e8ff100956f7.tar.gz
samba-edc32665d0f5cfd5d86f975c8ac8e8ff100956f7.tar.bz2
samba-edc32665d0f5cfd5d86f975c8ac8e8ff100956f7.zip
s4:smbd: use tevent_ fn names instead of leagcy event_ ones
-rw-r--r--source4/smbd/process_onefork.c2
-rw-r--r--source4/smbd/process_prefork.c6
-rw-r--r--source4/smbd/process_standard.c4
-rw-r--r--source4/smbd/process_thread.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/source4/smbd/process_onefork.c b/source4/smbd/process_onefork.c
index 979a8e10ad..251e5074c8 100644
--- a/source4/smbd/process_onefork.c
+++ b/source4/smbd/process_onefork.c
@@ -120,7 +120,7 @@ static void onefork_new_task(struct tevent_context *ev,
/* setup this new connection: process will bind to it's sockets etc */
new_task_fn(ev, lp_ctx, cluster_id(pid, 0), private_data);
- event_loop_wait(ev);
+ tevent_loop_wait(ev);
talloc_free(ev);
exit(0);
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c
index a0aaf9290a..e4a519a1d5 100644
--- a/source4/smbd/process_prefork.c
+++ b/source4/smbd/process_prefork.c
@@ -136,7 +136,7 @@ static void prefork_new_task(struct tevent_context *ev,
/* We don't want any kids hanging around for this one,
* let the parent do all the work */
- event_loop_wait(ev2);
+ tevent_loop_wait(ev2);
talloc_free(ev2);
exit(0);
@@ -160,7 +160,7 @@ static void prefork_new_task(struct tevent_context *ev,
/* we can't return to the top level here, as that event context is gone,
so we now process events in the new event context until there are no
more to process */
- event_loop_wait(ev2);
+ tevent_loop_wait(ev2);
talloc_free(ev2);
exit(0);
@@ -178,7 +178,7 @@ static void prefork_new_task(struct tevent_context *ev,
/* we can't return to the top level here, as that event context is gone,
so we now process events in the new event context until there are no
more to process */
- event_loop_wait(ev_parent);
+ tevent_loop_wait(ev_parent);
talloc_free(ev_parent);
exit(0);
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 6857674e7f..1e9b8ed8ac 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -146,7 +146,7 @@ static void standard_accept_connection(struct tevent_context *ev,
/* we can't return to the top level here, as that event context is gone,
so we now process events in the new event context until there are no
more to process */
- event_loop_wait(ev);
+ tevent_loop_wait(ev);
talloc_free(ev);
exit(0);
@@ -196,7 +196,7 @@ static void standard_new_task(struct tevent_context *ev,
/* we can't return to the top level here, as that event context is gone,
so we now process events in the new event context until there are no
more to process */
- event_loop_wait(ev);
+ tevent_loop_wait(ev);
talloc_free(ev);
exit(0);
diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index cf94234c34..764c1f36d5 100644
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -52,7 +52,7 @@ static void *thread_connection_fn(void *thread_parm)
new_conn->new_conn(new_conn->ev, new_conn->lp_ctx, new_conn->sock, pthread_self(), new_conn->private_data);
/* run this connection from here */
- event_loop_wait(new_conn->ev);
+ tevent_loop_wait(new_conn->ev);
talloc_free(new_conn);
@@ -137,7 +137,7 @@ static void *thread_task_fn(void *thread_parm)
new_task->private_data);
/* run this connection from here */
- event_loop_wait(new_task->ev);
+ tevent_loop_wait(new_task->ev);
talloc_free(new_task);