Cosmetics.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 1bbef74358aee51e75b8806a6eef9697d6c31696..0875d17d0dd0ebba5141f7db53be474f89597924 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -1,25 +1,15 @@
 /*
  * 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 <sys/types.h>
+#include <dirent.h>
 
+#include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "recv.h"
@@ -43,6 +33,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++)
@@ -57,8 +48,8 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 static void rn_event_handler(struct task *t)
 {
        struct receiver_node *rn = t->private_data;
-       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
-       rn->eof = 1;
+       PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
+       rn->error = t->ret;
        unregister_task(t);
 }
 
@@ -103,7 +94,7 @@ int main(int argc, char *argv[])
        stdout_set_defaults(&sot);
        sot.buf = rn.buf;
        sot.loaded = &rn.loaded;
-       sot.input_eof = &rn.eof;
+       sot.input_error = &rn.error;
        register_task(&sot.task);
 
        rn.task.private_data = &rn;
@@ -113,13 +104,13 @@ int main(int argc, char *argv[])
        sprintf(rn.task.status, "receiver node");
        register_task(&rn.task);
 
-       ret = sched(&s);
+       ret = schedule(&s);
 out:
        if (r_opened)
                r->close(&rn);
        if (r)
                r->shutdown();
        if (ret < 0)
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }