X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=59630dfcc5f5f6fc5cfa973fd25c4476366b6b92;hp=2d6aa74a55063da799f35d1b9abbe07b33aa59b4;hb=e0e0da08c77df028c261e27f3ab0b6250fbaa3bc;hpb=72e9bdf7c5c09ca4c20cad56c68a9a155cceff43 diff --git a/recv_common.c b/recv_common.c index 2d6aa74a..59630dfc 100644 --- a/recv_common.c +++ b/recv_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -55,10 +55,10 @@ static void *parse_receiver_args(int receiver_num, char *options) * \param \ra string of the form receiver_name:options * \param receiver_num contains the number of the receiver upon success * - * This function checks whether \a ra starts with the name of a supported - * paraslash receiver, optinally followed by a colon and any options for that - * receiver. If a valid receiver name was found the remaining part of \a ra is - * passed to the receiver's config parser. + * This function checks whether \a ra starts with the name of a receiver, + * optionally followed by options for that receiver. If a valid receiver name + * was found the remaining part of \a ra is passed to the receiver's config + * parser. * * \return On success, a pointer to the receiver-specific gengetopt args info * struct is returned and \a receiver_num contains the number of the receiver. @@ -116,7 +116,7 @@ void print_receiver_helps(unsigned flags) * Simple pre-select hook, used by all receivers. * * \param s Scheduler info. - * \param t Determines the receiver node. + * \param rn The receiver node. * * This requests a minimal delay from the scheduler if the status of the buffer * tree node indicates an error/eof condition. No file descriptors are added to @@ -125,12 +125,10 @@ void print_receiver_helps(unsigned flags) * \return The status of the btr node of the receiver node, i.e. the return * value of the underlying call to \ref btr_node_status(). */ -int generic_recv_pre_select(struct sched *s, struct task *t) +int generic_recv_pre_select(struct sched *s, struct receiver_node *rn) { - struct receiver_node *rn = container_of(t, struct receiver_node, task); int ret = btr_node_status(rn->btrn, 0, BTR_NT_ROOT); - t->error = 0; if (ret < 0) sched_min_delay(s); return ret;