compress: Switch to the alternative post select method.

[paraslash.git] / compress_filter.c

diff --git a/compress_filter.c b/compress_filter.c
index 3dee5ccd1e62e5e5e155e717b44bf7dd408ffdfb..85c365caefaff629df8e7f52eb87f6be16ad2d71 100644 (file)
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -41,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;
@@ -56,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 */
@@ -108,25 +107,18 @@ next_buffer:
        goto next_buffer;
 err:
        assert(ret < 0);
-       t->error = ret;
        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)
@@ -142,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);
 }
 
 /**
@@ -154,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) {