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

uspace/lib/http/src/response.c

@@ -34 +34 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40 +41 @@
 
 #include <http/http.h>
-#include <http/errno.h>
 
 static bool is_digit(char c)
@@ -54 +54 @@
         recv_mark(rb, &start);
         int rc = recv_while(rb, is_digit);
-        if (rc < 0) {
+        if (rc != EOK) {
                 recv_unmark(rb, &start);
                 return rc;
@@ -96 +96 @@
 static int expect(receive_buffer_t *rb, const char *expect)
 {
-        int rc = recv_discard_str(rb, expect);
-        if (rc < 0)
-                return rc;
-        if ((size_t) rc < str_length(expect))
+        size_t ndisc;
+        int rc = recv_discard_str(rb, expect, &ndisc);
+        if (rc != EOK)
+                return rc;
+        if (ndisc < str_length(expect))
                 return HTTP_EPARSE;
         return EOK;
@@ -148 +149 @@
         
         rc = recv_while(rb, is_not_newline);
-        if (rc < 0) {
+        if (rc != EOK) {
                 recv_unmark(rb, &msg_start);
                 return rc;
@@ -168 +169 @@
         recv_unmark(rb, &msg_end);
         
-        rc = recv_eol(rb);
-        if (rc == 0)
+        size_t nrecv;
+        rc = recv_eol(rb, &nrecv);
+        if (rc == EOK && nrecv == 0)
                 rc = HTTP_EPARSE;
-        if (rc < 0) {
+        if (rc != EOK) {
                 free(message);
                 return rc;
@@ -204 +206 @@
                 goto error;
         
-        rc = recv_eol(rb);
-        if (rc == 0)
+        size_t nrecv;
+        rc = recv_eol(rb, &nrecv);
+        if (rc == EOK && nrecv == 0)
                 rc = HTTP_EPARSE;
-        if (rc < 0)
+        if (rc != EOK)
                 goto error;