X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=686fda3108e6d604b905d06176df3801d239807d;hb=181beb316afad036ac01a778544c5dec0a8d51c7;hp=d779ff864ddebfc38a34ba1a0d166b5c04089556;hpb=c75c35b176cdacf157d27617e954961c88f33975;p=paraslash.git

diff --git a/gui.c b/gui.c
index d779ff86..686fda31 100644
--- a/gui.c
+++ b/gui.c
@@ -621,7 +621,7 @@ static void status_pre_select(struct sched *s, void *context)
 		sched_request_barrier_or_min_delay(&st->next_exec, s);
 }
 
-static int status_post_select(struct sched *s, void *context)
+static int status_post_select(__a_unused struct sched *s, void *context)
 {
 	struct status_task *st = context;
 	size_t sz;
@@ -667,7 +667,7 @@ static int status_post_select(struct sched *s, void *context)
 	}
 	assert(st->loaded < st->bufsize);
 	ret = read_nonblock(st->fd, st->buf + st->loaded,
-		st->bufsize - st->loaded, &s->rfds, &sz);
+		st->bufsize - st->loaded, &sz);
 	st->loaded += sz;
 	ret2 = for_each_stat_item(st->buf, st->loaded, update_item);
 	if (ret < 0 || ret2 < 0) {
@@ -894,7 +894,7 @@ static void reread_conf(void)
 /* React to various signal-related events. */
 static int signal_post_select(struct sched *s, __a_unused void *context)
 {
-	int ret = para_next_signal(&s->rfds);
+	int ret = para_next_signal();
 
 	if (ret <= 0)
 		return 0;
@@ -942,7 +942,7 @@ static void exec_pre_select(struct sched *s, void *context)
 		sched_min_delay(s);
 }
 
-static int exec_post_select(struct sched *s, void *context)
+static int exec_post_select(__a_unused struct sched *s, void *context)
 {
 	struct exec_task *ct = context;
 	int i, ret;
@@ -963,7 +963,7 @@ static int exec_post_select(struct sched *s, void *context)
 			continue;
 		ret = read_nonblock(exec_fds[i],
 			ct->command_buf[i] + ct->cbo[i],
-			COMMAND_BUF_SIZE - 1 - ct->cbo[i], &s->rfds, &sz);
+			COMMAND_BUF_SIZE - 1 - ct->cbo[i], &sz);
 		ct->cbo[i] += sz;
 		sz = ct->cbo[i];
 		ct->cbo[i] = for_each_line(ct->flags[i], ct->command_buf[i],
@@ -1391,7 +1391,7 @@ static int setup_tasks_and_schedule(void)
 	struct status_task status_task = {.fd = -1};
 	struct input_task input_task = {.task = NULL};
 	struct signal_task *signal_task;
-	struct sched sched = {.default_timeout = {.tv_sec = 1}};
+	struct sched sched = {.default_timeout = 1000};
 
 	exec_task.task = task_register(&(struct task_info) {
 		.name = "exec",