X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=ee08f28eadc60f53a1c301ffd3b917117914f119;hp=1bb20b31fb8b7ed421edf357d8b86195f89e96e3;hb=34762fdc56d5294c15e03fda433ecfccdc6c5fb2;hpb=6f58bbe94b49c0fb473bffebde598a3d26b051f3

diff --git a/filter.c b/filter.c
index 1bb20b31..ee08f28e 100644
--- a/filter.c
+++ b/filter.c
@@ -28,28 +28,28 @@
 #include "stdout.h"
 #include "error.h"
 
+/** init the array of errors for para_filter */
 INIT_FILTER_ERRLISTS;
 
+/** the task that reads from stdin */
 static struct stdin_task stdin_task_struct;
+/** pointer to the stdin task */
 static struct stdin_task *sit = &stdin_task_struct;
+
+/** the task that filters the data */
 static struct filter_chain filter_chain_struct;
+/** pointer to the filter chain */
 static struct filter_chain *fc = &filter_chain_struct;
+
+/** the task that writes converted data to stdout */
 static struct stdout_task stdout_task_struct;
+/** pointer to the stdout task */
 static struct stdout_task *sot = &stdout_task_struct;
 
+/** gengetopt struct that holds the command line args */
 static struct filter_args_info conf;
 
-__printf_2_3 void para_log(int ll, const char* fmt,...)
-{
-	va_list argp;
-
-	/* ignore log message if loglevel is not high enough */
-	if (ll < conf.loglevel_arg)
-		return;
-	va_start(argp, fmt);
-	vfprintf(stderr, fmt, argp);
-	va_end(argp);
-}
+INIT_STDERR_LOGGING(conf.loglevel_arg);
 
 static void filter_event_handler(struct task *t)
 {
@@ -114,6 +114,7 @@ static int parse_config(int argc, char *argv[])
 
 	if (filter_cmdline_parser(argc, argv, &conf))
 		return -E_FILTER_SYNTAX;
+	HANDLE_VERSION_FLAG("filter", conf);
 	if (!cf) {
 		char *home = para_homedir();
 		cf = make_message("%s/.paraslash/filter.conf", home);
@@ -134,6 +135,18 @@ static int parse_config(int argc, char *argv[])
 	exit(EXIT_SUCCESS);
 }
 
+/**
+ * para_filter's main function.
+ *
+ * para_filter reads data from stdin, converts it by using a chain
+ * of filters (specified on the command line) and writes the resulting
+ * data to stdout.
+ *
+ * \param argc number of command line options
+ * \param argv vector of arguments
+ *
+ * \return \a EXIT_SUCCESS on success, EXIT_FAILURE on errors.
+ */
 int main(int argc, char *argv[])
 {
 	int ret;
@@ -155,9 +168,9 @@ int main(int argc, char *argv[])
 	sot->loaded = fc->out_loaded;
 	sot->input_eof = &fc->eof;
 
-	register_task(&sot->task);
-	register_task(&fc->task);
 	register_task(&sit->task);
+	register_task(&fc->task);
+	register_task(&sot->task);
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	ret = sched(&s);