Merge branch 'master' into next

[paraslash.git] / filter.h

diff --git a/filter.h b/filter.h
index 0bb51f5ae1e45bcd3396a91bfbba367cbafdec9c..15bfaf8cdb0c2533c463fe8272d21e5528b80dbd 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -95,18 +95,10 @@ struct filter_chain {
 struct filter_callback {
        /** All callbacks are organized in a doubly linked list. */
        struct list_head node;
-       /**
-        * Private data.
-        *
-        * May be initialized by the application before registering the callback. This
-        * pointer is not used by the filter subsystem. It is provided for use within
-        * the input/output/close callback functions.
-        */
-       void *data;
        /**
         * The input callback.
         *
-        * In not \p NULL, the filter subsystem calls this function whenever the filter
+        * If not \p NULL, the filter subsystem calls this function whenever the filter
         * consumed some or all of its input buffer. A pointer to the buffer of consumed
         * data, its length and a pointer to the own \a filter_callback structure are passed
         * to \a input_cb. The input callback is expected to return a negative value on errors.
@@ -204,7 +196,7 @@ struct filter {
 void close_filters(struct filter_chain *fc);
 void filter_init(void);
 int check_filter_arg(char *filter_arg, void **conf);
-void filter_pre_select(__a_unused struct sched *s, struct task *t);
+void filter_post_select(__a_unused struct sched *s, struct task *t);
 void print_filter_helps(int detailed);
 
 static inline void write_int16_host_endian(char *buf, int val)