X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=a36038ad23ddad69a7139891ff07404e05671182;hp=c418af129a0560fdb09e2aa2cf32e1c7b68146ed;hb=a8fd00dc4494bbcaecdf2302005c05a2d104b380;hpb=fd849823e540103ff0c8ac9c687e03872e84877c diff --git a/http_recv.c b/http_recv.c index c418af12..a36038ad 100644 --- a/http_recv.c +++ b/http_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * * 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 @@ -51,7 +51,7 @@ struct private_http_recv_data { * * the current status of the http receiver node * - * It gets initialized to #HTTP_CONNECTED by the open function of the + * It gets initialized to \p HTTP_CONNECTED by the open function of the * http receiver. * * \sa receiver::open, receiver_node. @@ -69,11 +69,11 @@ struct private_http_recv_data { * * The post_select function of the http receiver uses \a fd, if ready, to * establish the http connection, and updates \a status according to the new - * state of the connection. As soon as \a status is #HTTP_STREAMING, \a fd is + * state of the connection. As soon as \a status is \p HTTP_STREAMING, \a fd is * going to be only checked for reading. If data is available, it is read into * the output buffer of the receiver node by post_select. * - * \sa receiver::pre_select receiver::post_select receiver_node + * \sa receiver::pre_select receiver::post_select receiver_node, http_recv_status */ int fd; }; @@ -139,7 +139,7 @@ static void http_recv_post_select(struct sched *s, struct task *t) phd->status = HTTP_STREAMING; goto out; } - t->ret = -E_OVERRUN; + t->ret = -E_HTTP_RECV_OVERRUN; if (rn->loaded >= BUFSIZE) goto out; t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded, @@ -185,7 +185,7 @@ static int http_recv_open(struct receiver_node *rn) rn->private_data = para_calloc(sizeof(struct private_http_recv_data)); phd = rn->private_data; ret = get_host_info(conf->host_arg, &he); - if (!ret < 0) + if (ret < 0) goto err_out; /* get new socket */ ret = get_socket();