X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=3671633b2d3032d5041693f15eaa558df085acdc;hp=bf5ce629175e70dd35b34655e102416b6699c973;hb=c4ecbd8f75be7847f7332dd64f11a0ba54233891;hpb=3e92fcb6f07d8e6ee4bbcc06d26d569173d6c109

diff --git a/write.c b/write.c
index bf5ce629..3671633b 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -60,9 +60,9 @@ struct initial_delay_task {
 };
 
 static struct write_args_info conf;
-struct stdin_task sit;
-struct check_wav_task cwt;
-struct initial_delay_task idt;
+static struct stdin_task sit;
+static struct check_wav_task cwt;
+static struct initial_delay_task idt;
 static struct writer_node_group *wng;
 
 /** length of a standard wav header */
@@ -113,22 +113,7 @@ static void initial_delay_pre_select(struct sched *s, struct task *t)
 		s->timeout = diff;
 }
 
-/**
- * all log messages are written to stderr
- *
- * \param ll: loglevel
- * \param fmt: format string
- */
-void para_log(int ll, const char* fmt,...)
-{
-	va_list argp;
-
-	if (ll < conf.loglevel_arg)
-		return;
-	va_start(argp, fmt);
-	vfprintf(stderr, fmt, argp);
-	va_end(argp);
-}
+INIT_STDERR_LOGGING(conf.loglevel_arg)
 
 static struct writer_node_group *check_args(void)
 {
@@ -231,9 +216,13 @@ static void cwt_event_handler(struct task *t)
 /**
  * para_write's main function
  *
+ * \param argc the usual argument counter
+ * \param argv the usual argument vector
+ *
  * It registers the stdin task, the check_wav_task, the task for initial delay
  * and all tasks for actually writing out the stream.
  *
+ * \return \p EXIT_SUCCESS or EXIT_FAILURE
  */
 int main(int argc, char *argv[])
 {
@@ -241,6 +230,7 @@ int main(int argc, char *argv[])
 	struct sched s;
 
 	write_cmdline_parser(argc, argv, &conf);
+	HANDLE_VERSION_FLAG("write", conf);
 	init_supported_writers();
 
 	wng = check_args();