Changes in uspace/lib/http/src/response.c [cbfc8b7:10de842] in mainline

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;