From: Andre Noll <maan@systemlinux.org>
Date: Sun, 31 Mar 2013 16:44:57 +0000 (+0000)
Subject: audiod: Switch command_task to the alternative post select method.
X-Git-Tag: v0.4.13~39^2~19
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=043fd6e371c218523aefbf6f86ca1d2d402b072f;hp=ce462a35951601577f187e30e0a651ed04c3fb51;p=paraslash.git

audiod: Switch command_task to the alternative post select method.
---

diff --git a/audiod.c b/audiod.c
index 91122308..f412dc6d 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1032,7 +1032,7 @@ static void command_pre_select(struct sched *s, struct task *t)
 	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, struct task *t)
 {
 	int ret;
 	struct command_task *ct = container_of(t, struct command_task, task);
@@ -1049,13 +1049,14 @@ static void command_post_select(struct sched *s, struct task *t)
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	audiod_status_dump();
+	return 0;
 }
 
 static void init_command_task(struct command_task *ct)
 {
 	ct->task.pre_select = command_pre_select;
-	ct->task.post_select = command_post_select;
-	ct->task.new_post_select = NULL;
+	ct->task.new_post_select = command_post_select;
+	ct->task.post_select = NULL;
 	ct->task.error = 0;
 	ct->fd = audiod_get_socket(); /* doesn't return on errors */
 	sprintf(ct->task.status, "command task");