X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=85c365caefaff629df8e7f52eb87f6be16ad2d71;hp=09a4c74d17dd7642dccbe990f4cb309418e58b71;hb=f6e2cbd7877d40f6eff2ea4ea09a131022a01764;hpb=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8

diff --git a/compress_filter.c b/compress_filter.c
index 09a4c74d..85c365ca 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,7 +11,6 @@
  */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "compress_filter.cmdline.h"
@@ -42,7 +41,7 @@ static void compress_close(struct filter_node *fn)
 	free(fn->private_data);
 }
 
-static void compress_post_select(__a_unused struct sched *s, struct task *t)
+static int compress_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_compress_data *pcd = fn->private_data;
@@ -57,12 +56,11 @@ static void compress_post_select(__a_unused struct sched *s, struct task *t)
 
 	//inplace = false;
 next_buffer:
-	t->error = 0;
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
-		return;
+		return 0;
 	btr_merge(btrn, fn->min_iqs);
 	length = btr_next_buffer(btrn, &inbuf) & ~(size_t)1;
 	if (length == 0) { /* eof and 1 byte available */
@@ -109,25 +107,18 @@ next_buffer:
 	goto next_buffer;
 err:
 	assert(ret < 0);
-	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 /** TODO: Add sanity checks */
 static int compress_parse_config(int argc, char **argv, void **config)
 {
-	int ret;
-	struct compress_filter_args_info *compress_conf
-		= para_calloc(sizeof(*compress_conf));
+	struct compress_filter_args_info *conf = para_calloc(sizeof(*conf));
 
-	ret = -E_COMPRESS_SYNTAX;
-	if (compress_cmdline_parser(argc, argv, compress_conf))
-		goto err;
-	*config = compress_conf;
+	compress_filter_cmdline_parser(argc, argv, conf);
+	*config = conf;
 	return 1;
-err:
-	free(compress_conf);
-	return  ret;
 }
 
 static void compress_open(struct filter_node *fn)
@@ -143,7 +134,7 @@ static void compress_open(struct filter_node *fn)
 
 static void compress_free_config(void *conf)
 {
-	compress_cmdline_parser_free(conf);
+	compress_filter_cmdline_parser_free(conf);
 }
 
 /**
@@ -155,11 +146,12 @@ void compress_filter_init(struct filter *f)
 {
 	struct compress_filter_args_info dummy;
 
-	compress_cmdline_parser_init(&dummy);
+	compress_filter_cmdline_parser_init(&dummy);
 	f->open = compress_open;
 	f->close = compress_close;
 	f->pre_select = generic_filter_pre_select;
-	f->post_select = compress_post_select;
+	f->new_post_select = compress_post_select;
+	f->post_select = NULL;
 	f->parse_config = compress_parse_config;
 	f->free_config = compress_free_config;
 	f->help = (struct ggo_help) {