X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=0875d17d0dd0ebba5141f7db53be474f89597924;hp=a7a957dddde4188381ec042896f75792d965402e;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=ce2bb6c458275ec6c0a115a2c814a15761474f11;ds=sidebyside

diff --git a/recv.c b/recv.c
index a7a957dd..0875d17d 100644
--- 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"
@@ -58,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);
 }
 
@@ -104,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;
@@ -114,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;
 }