Simplify prepare_filter_node().

[paraslash.git] / filter_common.c

diff --git a/filter_common.c b/filter_common.c
index 7ffc50a760fca12b91db898dab9da625d3532a2c..988c357631e38159f1a1a3118c91005d0ca5aca1 100644 (file)
--- a/filter_common.c
+++ b/filter_common.c
@@ -279,8 +279,9 @@ void print_filter_helps(int detailed)
 /** 640K ought to be enough for everybody ;) */
 #define FILTER_MAX_PENDING (640 * 1024)
 
-int prepare_filter_node(struct btr_node *btrn, size_t min_len)
+int prepare_filter_node(struct filter_node *fn)
 {
+       struct btr_node *btrn = fn->btrn;
        size_t iqs;
 
        if (btr_eof(btrn))
@@ -288,10 +289,10 @@ int prepare_filter_node(struct btr_node *btrn, size_t min_len)
        if (btr_bytes_pending(btrn) > FILTER_MAX_PENDING)
                return 0;
        iqs = btr_get_input_queue_size(btrn);
-       if (iqs < min_len && !btr_no_parent(btrn))
+       if (iqs < fn->min_iqs && !btr_no_parent(btrn))
                return 0;
        assert(iqs != 0);
        /* avoid "buffer too small" errors from the decoder */
-       btr_merge(btrn, min_len);
+       btr_merge(btrn, fn->min_iqs);
        return 1;
 }