Changeset 132ab5d1 in mainline for uspace/lib/http/src/headers.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/headers.c (modified) (3 diffs)

uspace/lib/http/src/headers.c

@@ -34 +34 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41 +42 @@
 #include <http/http.h>
 #include <http/ctype.h>
-#include <http/errno.h>
 
 #define HTTP_HEADER_LINE "%s: %s\r\n"
@@ -146 +146 @@
                         continue;
                 
-                rc = recv_discard(rb, (c == '\r' ? '\n' : '\r'));
-                if (rc < 0)
+                size_t nrecv;
+                rc = recv_discard(rb, (c == '\r' ? '\n' : '\r'), &nrecv);
+                if (rc != EOK)
                         return rc;