projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trivial format string fix in dccp_send
[paraslash.git]
/
filter.c
diff --git
a/filter.c
b/filter.c
index 56afebf3a6ecfed020cf2c6dad065168a80277e0..0d1c2e243b4e21c221a5abcd23a4f93fa1dce228 100644
(file)
--- a/
filter.c
+++ b/
filter.c
@@
-37,7
+37,7
@@
static struct filter_chain *fc = &filter_chain_struct;
static struct stdout_task stdout_task_struct;
static struct stdout_task *sot = &stdout_task_struct;
static struct stdout_task stdout_task_struct;
static struct stdout_task *sot = &stdout_task_struct;
-struct
gengetopt
_args_info conf;
+struct
filter
_args_info conf;
__printf_2_3 void para_log(int ll, const char* fmt,...)
{
__printf_2_3 void para_log(int ll, const char* fmt,...)
{
@@
-113,7
+113,7
@@
static int parse_config(int argc, char *argv[])
struct stat statbuf;
int i;
struct stat statbuf;
int i;
- if (cmdline_parser(argc, argv, &conf))
+ if (
filter_
cmdline_parser(argc, argv, &conf))
return -E_FILTER_SYNTAX;
if (!cf) {
char *home = para_homedir();
return -E_FILTER_SYNTAX;
if (!cf) {
char *home = para_homedir();
@@
-121,7
+121,7
@@
static int parse_config(int argc, char *argv[])
free(home);
}
if (!stat(cf, &statbuf)) {
free(home);
}
if (!stat(cf, &statbuf)) {
- if (cmdline_parser_configfile(cf, &conf, 0, 0, 0))
+ if (
filter_
cmdline_parser_configfile(cf, &conf, 0, 0, 0))
return -E_FILTER_SYNTAX;
}
if (!conf.list_filters_given)
return -E_FILTER_SYNTAX;
}
if (!conf.list_filters_given)
@@
-140,7
+140,6
@@
int main(int argc, char *argv[])
int ret;
struct sched s;
int ret;
struct sched s;
- init_sched();
stdin_set_defaults(sit);
sit->buf = para_malloc(sit->bufsize),
stdin_set_defaults(sit);
sit->buf = para_malloc(sit->bufsize),
@@
-153,7
+152,6
@@
int main(int argc, char *argv[])
goto out;
stdout_set_defaults(sot);
goto out;
stdout_set_defaults(sot);
- PARA_EMERG_LOG("fc->output_eof: %d\n", *fc->output_eof);
sot->buf = fc->outbuf;
sot->loaded = fc->out_loaded;
sot->input_eof = &fc->eof;
sot->buf = fc->outbuf;
sot->loaded = fc->out_loaded;
sot->input_eof = &fc->eof;
@@
-163,7
+161,6
@@
int main(int argc, char *argv[])
register_task(&sit->task);
s.default_timeout.tv_sec = 1;
s.default_timeout.tv_usec = 0;
register_task(&sit->task);
s.default_timeout.tv_sec = 1;
s.default_timeout.tv_usec = 0;
- PARA_EMERG_LOG("fc->output_eof: %d\n", *fc->output_eof);
ret = sched(&s);
out:
free(sit->buf);
ret = sched(&s);
out:
free(sit->buf);