From b3e493470f3465cfe5cfa958b019ac8cfb8f12f2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 25 Jun 2005 23:53:14 +0000 Subject: r7911: task_terminate() is defined in the macosx headers, so change the name to task_server_terminate() (This used to be commit a7447e25ac203f0ee09ffdf72df1094eb70e7c0c) --- source4/smbd/service_task.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/smbd/service_task.c') diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index c09cf2a0ac..c6784e7132 100644 --- a/source4/smbd/service_task.c +++ b/source4/smbd/service_task.c @@ -29,11 +29,11 @@ /* terminate a task service */ -void task_terminate(struct task_server *task, const char *reason) +void task_server_terminate(struct task_server *task, const char *reason) { struct event_context *event_ctx = task->event_ctx; const struct model_ops *model_ops = task->model_ops; - DEBUG(0,("task_terminate: [%s]\n", reason)); + DEBUG(0,("task_server_terminate: [%s]\n", reason)); talloc_free(task); model_ops->terminate(event_ctx, reason); } @@ -63,7 +63,7 @@ static void task_server_callback(struct event_context *event_ctx, uint32_t serve task->msg_ctx = messaging_init(task, task->server_id, task->event_ctx); if (!task->msg_ctx) { - task_terminate(task, "messaging_init() failed"); + task_server_terminate(task, "messaging_init() failed"); return; } -- cgit