X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=stdin.c;h=b25a0ba013fb03b19cb757d07ff483c9389a0d70;hb=8bcf75a3921d15e03c4351b3efa609eac67c3817;hp=fd803ae5441acf01446dadab89c35d3bec14cecd;hpb=c5e38315901ea63efd169af5d4ba3f3c66db7de9;p=paraslash.git diff --git a/stdin.c b/stdin.c index fd803ae5..b25a0ba0 100644 --- a/stdin.c +++ b/stdin.c @@ -33,7 +33,6 @@ static void stdin_pre_select(struct sched *s, struct task *t) struct stdin_task *sit = container_of(t, struct stdin_task, task); int ret; - t->error = 0; ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT); if (ret < 0) sched_min_delay(s); @@ -55,22 +54,21 @@ static void stdin_pre_select(struct sched *s, struct task *t) * appears to be readable, data is read from stdin and fed into the buffer * tree. */ -static void stdin_post_select(struct sched *s, struct task *t) +static int stdin_post_select(struct sched *s, struct task *t) { struct stdin_task *sit = container_of(t, struct stdin_task, task); ssize_t ret; size_t sz, n; char *buf = NULL; - t->error = 0; ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT); if (ret < 0) goto err; if (ret == 0) - return; + return 0; sz = btr_pool_get_buffer(sit->btrp, &buf); if (sz == 0) - return; + return 0; /* * Do not use the maximal size to avoid having only a single buffer * reference for the whole pool. This is bad because if that single @@ -81,11 +79,11 @@ static void stdin_post_select(struct sched *s, struct task *t) if (n > 0) btr_add_output_pool(sit->btrp, n, sit->btrn); if (ret >= 0) - return; + return 0; err: btr_remove_node(&sit->btrn); //btr_pool_free(sit->btrp); - t->error = ret; + return ret; } /**