/** \file filter_chain.c common helper functions for filter input/output */
-#include "gcc-compat.h"
#include "para.h"
#include "list.h"
#include "filter.h"
/**
* call the convert function of each filter
*
- * \param fci the filter chain containing the list of filter nodes.
+ * \param fc the filter chain containing the list of filter nodes.
*
* This is the core function of the filter subsystem. It loops over the list of
- * filter nodes determined by \a fci and calls the filter's convert function if
+ * filter nodes determined by \a fc 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
*
* \sa filter_node, filter#convert, filter_callback
*/
-int filter_io(struct filter_chain_info *fci)
+int filter_io(struct filter_chain *fc)
{
struct filter_node *fn;
char *ib;
size_t *loaded;
int conv, conv_total = 0;
again:
- ib = fci->inbuf;
- loaded = fci->in_loaded;
+ ib = fc->inbuf;
+ loaded = fc->in_loaded;
conv = 0;
- list_for_each_entry(fn, &fci->filters, node) {
+ list_for_each_entry(fn, &fc->filters, node) {
int ret;
if (*loaded && fn->loaded < fn->bufsize) {
size_t old_fn_loaded = fn->loaded;
- PARA_DEBUG_LOG("fc %p loaded: %d, calling %s convert\n", fci, *loaded, fn->filter->name);
+ PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
+ fc, *loaded, fn->filter->name);
ret = fn->filter->convert(ib, *loaded, fn);
if (ret < 0) {
- if (!fci->error)
- fci->error = -ret;
+ if (!fc->error)
+ fc->error = -ret;
return ret;
}
- call_callbacks(fn, ib, ret, fn->buf + old_fn_loaded, fn->loaded - old_fn_loaded);
+ call_callbacks(fn, ib, ret, fn->buf + old_fn_loaded,
+ fn->loaded - old_fn_loaded);
*loaded -= ret;
conv += ret;
if (*loaded && ret) {
- PARA_DEBUG_LOG("moving %d bytes in input buffer for %s filter\n",
+ PARA_DEBUG_LOG("moving %zd bytes in input buffer for %s filter\n",
*loaded, fn->filter->name);
memmove(ib, ib + ret, *loaded);
}
/**
* close all filter nodes and its callbacks
*
- * \param fci the filter chain to close
+ * \param fc the filter chain to close
*
- * For each filter node determined by \a fci, call the close function of each
+ * For each filter node determined by \a fc, call the close function of each
* registered filter callback as well as the close function of the
* corresponding filter. Free all resources and destroy all callback lists and
* the filter node list.
*
* \sa filter::close, filter_callback::close
*/
-void close_filters(struct filter_chain_info *fci)
+void close_filters(struct filter_chain *fc)
{
struct filter_node *fn, *tmp;
- if (!fci)
+ if (!fc)
return;
- PARA_DEBUG_LOG("closing filter chain %p\n", fci);
- list_for_each_entry_safe(fn, tmp, &fci->filters, node) {
- PARA_NOTICE_LOG("closing %s filter callbacks (fci %p, fn %p)\n", fn->filter->name, fci, fn);
+ PARA_DEBUG_LOG("closing filter chain %p\n", fc);
+ list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
+ PARA_NOTICE_LOG("closing %s filter callbacks (fc %p, fn %p)\n", fn->filter->name, fc, fn);
close_callbacks(fn);
- PARA_NOTICE_LOG("closing %s filter (fci %p, fn %p)\n", fn->filter->name, fci, fn);
+ PARA_NOTICE_LOG("closing %s filter (fc %p, fn %p)\n", fn->filter->name, fc, fn);
fn->filter->close(fn);
list_del(&fn->node);
free(fn);
{
struct filter *f = &filters[filter_num];
int i, argc = 2;
- char *dummy_args[] = {"", "", NULL};
char **argv;
// PARA_DEBUG_LOG("%s, options: %s, parser: %p\n", f->name,
// options? options : "(none)", f->parse_config);
if (!f->parse_config)
- return options? -E_BAD_FILTER_OPTIONS : filter_num;
- if (options) {
-// PARA_DEBUG_LOG("options: %s\n", options);
- argc = split_args(options, &argv, ' ');
+ return strlen(options)? -E_BAD_FILTER_OPTIONS : filter_num;
+// PARA_DEBUG_LOG("options: %s\n", options);
+ argc = split_args(options, &argv, " \t");
// PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
- for (i = argc; i >= 0; i--)
- argv[i + 1] = argv[i];
- argc += 2;
- *conf = f->parse_config(argc, argv);
- } else {
- /* is it OK to have no options? */
- *conf = f->parse_config(2, dummy_args);
- }
+ for (i = argc - 1; i >= 0; i--)
+ argv[i + 1] = argv[i];
+ argv[0] = para_strdup(f->name);
+ argc += 1;
+ *conf = f->parse_config(argc, argv);
return *conf? filter_num : -E_BAD_FILTER_OPTIONS;
}
/**
* check the filter command line options
*
- * \param fa the command line options (values separated by colons)
+ * \param fa the command line options
* \param conf points to the filter configuration upon successful return
*
* Check if \a fa starts with a the name of a supported filter, followed by
continue;
if (c && !filters[j].parse_config)
return -E_BAD_FILTER_OPTIONS;
- return parse_filter_args(j, c? fa + len + 1 : NULL, conf);
+ return parse_filter_args(j, c? fa + len + 1 :
+ fa + strlen(fa), conf);
}
return -E_UNSUPPORTED_FILTER;
}
projects / paraslash.git / blobdiff