X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=39055618cde7ea16bfd5f2207f4b00a3b314c5e2;hp=b17549c3a24b51d74e96c9caa63a30851e4e0094;hb=a94872914afe2e9cc96bb9f8f931a34fb471bb11;hpb=aa3c8a3f067dafda3e2f4c45b43e58246d0eb587

diff --git a/compress_filter.c b/compress_filter.c
index b17549c3..39055618 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -103,12 +103,17 @@ static void compress_post_select(__a_unused struct sched *s, struct task *t)
 	//inplace = false;
 next_buffer:
 	t->error = 0;
-	ret = prepare_filter_node(fn);
+	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
 		return;
+	btr_merge(btrn, fn->min_iqs);
 	length = btr_next_buffer(btrn, &inbuf) & ~(size_t)1;
+	if (length == 0) { /* eof and 1 byte available */
+		ret = -E_COMPRESS_EOF;
+		goto err;
+	}
 	ip = (int16_t *)inbuf;
 	if (inplace)
 		op = ip;
@@ -149,9 +154,8 @@ next_buffer:
 	goto next_buffer;
 err:
 	assert(ret < 0);
-	close_compress(fn);
 	t->error = ret;
-	btr_del_node(btrn);
+	btr_remove_node(btrn);
 }
 
 /** TODO: Add sanity checks */
@@ -184,6 +188,11 @@ static void open_compress(struct filter_node *fn)
 	pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg);
 }
 
+static void compress_free_config(void *conf)
+{
+	compress_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the compress filter.
  *
@@ -200,6 +209,7 @@ void compress_filter_init(struct filter *f)
 	f->pre_select = generic_filter_pre_select;
 	f->post_select = compress_post_select;
 	f->parse_config = compress_parse_config;
+	f->free_config = compress_free_config;
 	f->help = (struct ggo_help) {
 		.short_help = compress_filter_args_info_help,
 		.detailed_help = compress_filter_args_info_detailed_help