X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=recv_common.c;h=1939300a7c946d68d1b324ee6beb8c0bf146893b;hb=be5daec66f163725489f42d512659a8af5c3fd59;hp=31fd81f1ec52c3d0b6204e8b3663a7d36e14fbb3;hpb=0d1918752a18755bf701b82cf57fad79d9b18bc9;p=paraslash.git

diff --git a/recv_common.c b/recv_common.c
index 31fd81f1..1939300a 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -41,7 +41,7 @@ int check_receiver_arg(const char *ra, struct lls_parse_result **lprp)
 	*lprp = NULL;
 	if (!ra || !*ra) {
 		argc = 1;
-		argv = para_malloc(2 * sizeof(char*));
+		argv = alloc(2 * sizeof(char*));
 		argv[0] = para_strdup("http");
 		argv[1] = NULL;
 	} else {
@@ -98,19 +98,19 @@ void print_receiver_helps(bool detailed)
 }
 
 /**
- * Simple pre-select hook, used by all receivers.
+ * Request a minimal timeout in case of buffer tree errors.
  *
- * \param s Scheduler info.
- * \param rn The receiver node.
+ * \param s The scheduler instance.
+ * \param rn The buffer tree node is derived from this.
  *
- * 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
- * the fd sets of \a s.
+ * If the buffer tree node of the given receiver node is in error or EOF state,
+ * a minimal I/O timeout is requested from the scheduler. Otherwise, the
+ * function does nothing. No file descriptors are asked to be monitored.
  *
- * \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().
+ * \return The status of of the receiver node's buffer tree node. That is, the
+ * return value of the underlying call to \ref btr_node_status().
  */
-int generic_recv_pre_select(struct sched *s, struct receiver_node *rn)
+int generic_recv_pre_monitor(struct sched *s, struct receiver_node *rn)
 {
 	int ret = btr_node_status(rn->btrn, 0, BTR_NT_ROOT);