rename struct filter_chain_info to filter_chain

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index 46b48251d757c91360126d927469deab08769e88..c84b4823c745474f5ba92d59053f824cf946ca06 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -29,12 +29,12 @@ INIT_FILTER_ERRLISTS;
 
 #define INBUF_SIZE 32 * 1024
 
 
 #define INBUF_SIZE 32 * 1024
 

-static struct filter_chain_info filter_chain_info_struct;
-static struct filter_chain_info *fci = &filter_chain_info_struct;
+static struct filter_chain filter_chain_struct;
+static struct filter_chain *fc = &filter_chain_struct;

 
 struct gengetopt_args_info conf;
 
 
 struct gengetopt_args_info conf;
 

-__printf_2_3 void para_log(int ll, char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)

 {
        va_list argp;
 
 {
        va_list argp;
 


@@ -55,11 +55,11 @@ static int init_active_filter_list(void)
        int i, filter_num;
        struct filter_node *fn;
 
        int i, filter_num;
        struct filter_node *fn;
 

-       INIT_LIST_HEAD(&fci->filters);
+       INIT_LIST_HEAD(&fc->filters);

 
 

-       fci->inbuf = inbuf;
-       fci->in_loaded = &loaded;
-       fci->eof = &eof;
+       fc->inbuf = inbuf;
+       fc->in_loaded = &loaded;
+       fc->eof = &eof;

 
        for (i = 0; i < conf.filter_given; i++) {
                char *fa = para_strdup(conf.filter_arg[i]);
 
        for (i = 0; i < conf.filter_given; i++) {
                char *fa = para_strdup(conf.filter_arg[i]);


@@ -69,13 +69,13 @@ static int init_active_filter_list(void)
                        free(fn);
                        return filter_num;
                }
                        free(fn);
                        return filter_num;
                }

-               fn->fci = fci;
+               fn->fc = fc;

                INIT_LIST_HEAD(&fn->callbacks);
                fn->filter = &filters[filter_num];
                PARA_DEBUG_LOG("adding %s to filter chain\n", fn->filter->name);
                INIT_LIST_HEAD(&fn->callbacks);
                fn->filter = &filters[filter_num];
                PARA_DEBUG_LOG("adding %s to filter chain\n", fn->filter->name);

-               list_add_tail(&fn->node, &fci->filters);
+               list_add_tail(&fn->node, &fc->filters);

        }
        }

-       if (list_empty(&fci->filters))
+       if (list_empty(&fc->filters))

                return -E_NO_FILTERS;
        return 1;
 }
                return -E_NO_FILTERS;
        return 1;
 }


@@ -84,11 +84,11 @@ static void open_filters(void)
 {
        struct filter_node *fn;
 
 {
        struct filter_node *fn;
 

-       list_for_each_entry(fn, &fci->filters, node) {
+       list_for_each_entry(fn, &fc->filters, node) {

                fn->filter->open(fn);
                PARA_INFO_LOG("opened %s filter\n", fn->filter->name);
                fn->filter->open(fn);
                PARA_INFO_LOG("opened %s filter\n", fn->filter->name);

-               fci->outbuf = fn->buf;
-               fci->out_loaded = &fn->loaded;
+               fc->outbuf = fn->buf;
+               fc->out_loaded = &fn->loaded;

        }
 }
 
        }
 }
 


@@ -135,10 +135,10 @@ int main(int argc, char *argv[])
        if (ret < 0)
                goto out;
        open_filters();
        if (ret < 0)
                goto out;
        open_filters();

-       ib = fci->inbuf;
-       ob = fci->outbuf;
-       il = fci->in_loaded;
-       ol = fci->out_loaded;
+       ib = fc->inbuf;
+       ob = fc->outbuf;
+       il = fc->in_loaded;
+       ol = fc->out_loaded;

        PARA_DEBUG_LOG("ib %p in, ob: %p\n", ib, ob);
 again:
        if (*il < INBUF_SIZE && !eof) {
        PARA_DEBUG_LOG("ib %p in, ob: %p\n", ib, ob);
 again:
        if (*il < INBUF_SIZE && !eof) {


@@ -150,7 +150,7 @@ again:
                        eof = 1;
                *il += ret;
        }
                        eof = 1;
                *il += ret;
        }

-       ret = filter_io(fci);
+       ret = filter_io(fc);

        if (ret < 0)
                goto out;
        converted = ret;
        if (ret < 0)
                goto out;
        converted = ret;


@@ -171,6 +171,6 @@ again:
 out:
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
 out:
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));

-       close_filters(fci);
+       close_filters(fc);

        return ret;
 }
        return ret;
 }