projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
audiod.c: Fix stat task restarting.
[paraslash.git]
/
recv.c
diff --git
a/recv.c
b/recv.c
index 3a3d142692aeab0018c13770d7eab1a94502cccc..f9e5b9337f2e6775f0605d19e579438439e762d0 100644
(file)
--- a/
recv.c
+++ b/
recv.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-200
7
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-200
8
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-45,14
+45,6
@@
static void *parse_config(int argc, char *argv[], int *receiver_num)
return check_receiver_arg(conf.receiver_arg, receiver_num);
}
return check_receiver_arg(conf.receiver_arg, 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;
- unregister_task(t);
-}
-
/**
* the main function of para_recv
*
/**
* the main function of para_recv
*
@@
-81,7
+73,7
@@
int main(int argc, char *argv[])
ret = -E_RECV_SYNTAX;
rn.conf = parse_config(argc, argv, &receiver_num);
if (!rn.conf) {
ret = -E_RECV_SYNTAX;
rn.conf = parse_config(argc, argv, &receiver_num);
if (!rn.conf) {
- PARA_EMERG_LOG("
%s", "
parse failed\n");
+ PARA_EMERG_LOG("parse failed\n");
goto out;
}
r = &receivers[receiver_num];
goto out;
}
r = &receivers[receiver_num];
@@
-94,23
+86,21
@@
int main(int argc, char *argv[])
stdout_set_defaults(&sot);
sot.buf = rn.buf;
sot.loaded = &rn.loaded;
stdout_set_defaults(&sot);
sot.buf = rn.buf;
sot.loaded = &rn.loaded;
- sot.input_e
of = &rn.eof
;
+ sot.input_e
rror = &rn.task.error
;
register_task(&sot.task);
register_task(&sot.task);
- rn.task.private_data = &rn;
rn.task.pre_select = r->pre_select;
rn.task.post_select = r->post_select;
rn.task.pre_select = r->pre_select;
rn.task.post_select = r->post_select;
- rn.task.event_handler = rn_event_handler;
sprintf(rn.task.status, "receiver node");
register_task(&rn.task);
sprintf(rn.task.status, "receiver node");
register_task(&rn.task);
- ret = sched(&s);
+ ret = sched
ule
(&s);
out:
if (r_opened)
r->close(&rn);
if (r)
r->shutdown();
if (ret < 0)
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;
}
return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
}