Kill unused filter_post_select().
authorAndre Noll <maan@systemlinux.org>
Tue, 12 Jan 2010 05:54:53 +0000 (06:54 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 12 Jan 2010 05:54:53 +0000 (06:54 +0100)
filter.h
filter_common.c

index 4a17c10..cad163d 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -195,8 +195,14 @@ struct filter {
 
        /** The help texts for this filter. */
        struct ggo_help help;
-
        void (*pre_select)(struct sched *s, struct task *t);
+       /**
+        * Convert (filter) the given data.
+        *
+        * Pointer to the converting function of the filter. It should convert as
+        * input data as possible. On errors, the post_select function is supposed
+        * to set t->error to a (negative) error code.
+        */
        void (*post_select)(struct sched *s, struct task *t);
        btr_command_handler execute;
 };
@@ -204,7 +210,6 @@ struct filter {
 void close_filters(struct filter_chain *fc);
 void filter_init(void);
 int check_filter_arg(char *filter_arg, void **conf);
-void filter_post_select(__a_unused struct sched *s, struct task *t);
 void print_filter_helps(int detailed);
 void generic_filter_pre_select(struct sched *s, struct task *t);
 
index 7fa3080..0c92f42 100644 (file)
@@ -70,90 +70,6 @@ static void close_callbacks(struct filter_node *fn)
        }
 }
 
-static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
-       char *outbuf, size_t outlen)
-{
-       struct filter_callback *fcb, *tmp;
-       list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) {
-               int ret;
-               if (inlen && fcb->input_cb) {
-                       ret = fcb->input_cb(inbuf, inlen, fcb);
-                       if (ret < 0) {
-                               close_filter_callback(fcb);
-                               continue;
-                       }
-               }
-               if (!outlen || !fcb->output_cb)
-                       continue;
-               ret = fcb->output_cb(outbuf, outlen, fcb);
-               if (ret < 0)
-                       close_filter_callback(fcb);
-       }
-}
-
-/**
- * Call the convert function of each filter.
- *
- * \param s Unused.
- * \param t The task identifying the filter chain.
- *
- * This is the core function of the filter subsystem. It loops over the list of
- * filter nodes determined by \a t and calls the filter's convert function if
- * there is input available for the filter node in question. If the convert
- * function consumed some or all of its input data, all registered input
- * callbacks are called.  Similarly, if a convert function produced output, all
- * registered output callbacks get called.
- *
- * On errors a (negative) error code is stored in t->error.
- *
- * \sa filter_node, filter#convert, filter_callback.
- */
-void filter_post_select(__a_unused struct sched *s, struct task *t)
-{
-       struct filter_chain *fc = container_of(t, struct filter_chain, task);
-       struct filter_node *fn;
-       char *ib;
-       size_t *loaded;
-       int i, conv, conv_total = 0;
-
-       if (fc->output_error && *fc->output_error < 0) {
-               t->error =  *fc->output_error;
-               return;
-       }
-again:
-       ib = *fc->inbufp;
-       loaded = fc->in_loaded;
-       conv = 0;
-       FOR_EACH_FILTER_NODE(fn, fc, i) {
-               struct filter *f = filters + fn->filter_num;
-               if (fn->loaded < fn->bufsize) {
-                       size_t size, old_fn_loaded = fn->loaded;
-                       t->error = f->convert(ib, *loaded, fn);
-                       if (t->error < 0)
-                               return;
-                       size = t->error;
-                       call_callbacks(fn, ib, size, fn->buf + old_fn_loaded,
-                               fn->loaded - old_fn_loaded);
-                       *loaded -= size;
-                       conv += size + fn->loaded - old_fn_loaded;
-                       if (*loaded && size)
-                               memmove(ib, ib + size, *loaded);
-               }
-               ib = fn->buf;
-               loaded = &fn->loaded;
-       }
-       conv_total += conv;
-       if (conv)
-               goto again;
-       if (*fc->input_error >= 0)
-               return;
-       if (*fc->out_loaded)
-               return;
-       if (*fc->in_loaded && conv_total)
-               return;
-       t->error = -E_FC_EOF;
-}
-
 /**
  * Close all filter nodes and their callbacks.
  *