Rename afs.[ch] to afs_common.[ch].

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 3b1c6917bda57f9a5a810b713bb41261dd1ae045..423ccbc2c074bcd8a1f95a0c3614f3cbf4763d5b 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -1,20 +1,11 @@
 /*
- * 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
+
+/** \file recv.c the stand-alone audio stream receiver */
+
 #include "para.h"
 
 #include "list.h"
@@ -25,21 +16,14 @@
 #include "error.h"
 #include "stdout.h"
 
+/** the gengetopt args info struct */
 struct recv_args_info conf;
 
-INIT_RECV_ERRLISTS;
-
-__printf_2_3 void para_log(int ll, const char* fmt,...)
-{
-       va_list argp;
+/** always log to stderr */
+INIT_STDERR_LOGGING(conf.loglevel_arg);
 
-       /* 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 array of error codes used by para_recv */
+INIT_RECV_ERRLISTS;
 
 static void *parse_config(int argc, char *argv[], int *receiver_num)
 {
@@ -47,6 +31,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 
        if (recv_cmdline_parser(argc, argv, &conf))
                return NULL;
+       HANDLE_VERSION_FLAG("recv", conf);
        if (conf.list_receivers_given) {
                printf("available receivers: ");
                for (i = 0; receivers[i].name; i++)
@@ -58,7 +43,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
        return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
-void rn_event_handler(struct task *t)
+static void rn_event_handler(struct task *t)
 {
        struct receiver_node *rn = t->private_data;
        PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
@@ -66,10 +51,21 @@ void rn_event_handler(struct task *t)
        unregister_task(t);
 }
 
+/**
+ * the main function of para_recv
+ *
+ * \param argc number of arguments
+ * \param argv vector of arguments
+ *
+ * para_recv uses the specified receiver to receive an audio stream sent by
+ * para_server. The received data is written to stdout.
+ *
+ * \return \a EXIT_SUCCESS on success, \a EXIT_FAILURE on errors.
+ */
 int main(int argc, char *argv[])
 {
        int ret, r_opened = 0, receiver_num;
-       struct  receiver *r = NULL;
+       struct receiver *r = NULL;
        struct receiver_node rn;
        struct stdout_task sot;
        struct sched s;
@@ -106,7 +102,6 @@ int main(int argc, char *argv[])
        sprintf(rn.task.status, "receiver node");
        register_task(&rn.task);
 
-
        ret = sched(&s);
 out:
        if (r_opened)
@@ -115,5 +110,5 @@ out:
                r->shutdown();
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-       return ret;
+       return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }