Changeset 132ab5d1 in mainline for uspace/lib/http/src/http.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/http/src/http.c (modified) (1 diff)

uspace/lib/http/src/http.c

@@ -47 +47 @@
 #include <http/receive-buffer.h>
 
-static ssize_t http_receive(void *client_data, void *buf, size_t buf_size)
+static int http_receive(void *client_data, void *buf, size_t buf_size,
+    size_t *nrecv)
 {
         http_t *http = client_data;
-        size_t nrecv;
-        int rc;
 
-        rc = tcp_conn_recv_wait(http->conn, buf, buf_size, &nrecv);
-        if (rc != EOK)
-                return rc;
-
-        return nrecv;
+        return tcp_conn_recv_wait(http->conn, buf, buf_size, nrecv);
 }