Changes in uspace/lib/http/src/receive-buffer.c [b7fd2a0:9a09212] in mainline

File:

• uspace/lib/http/src/receive-buffer.c (modified) (14 diffs)

uspace/lib/http/src/receive-buffer.c

@@ -43 +43 @@
 #include <http/receive-buffer.h>
 
-errno_t recv_buffer_init(receive_buffer_t *rb, size_t buffer_size,
+int recv_buffer_init(receive_buffer_t *rb, size_t buffer_size,
     receive_func_t receive, void *client_data)
 {
@@ -61 +61 @@
 }
 
-static errno_t dummy_receive(void *unused, void *buf, size_t buf_size,
+static int dummy_receive(void *unused, void *buf, size_t buf_size,
     size_t *nrecv)
 {
@@ -68 +68 @@
 }
 
-errno_t recv_buffer_init_const(receive_buffer_t *rb, void *buf, size_t size)
-{
-        errno_t rc = recv_buffer_init(rb, size, dummy_receive, NULL);
+int recv_buffer_init_const(receive_buffer_t *rb, void *buf, size_t size)
+{
+        int rc = recv_buffer_init(rb, size, dummy_receive, NULL);
         if (rc != EOK)
                 return rc;
@@ -107 +107 @@
 }
 
-errno_t recv_cut(receive_buffer_t *rb, receive_buffer_mark_t *a, receive_buffer_mark_t *b, void **out_buf, size_t *out_size)
+int recv_cut(receive_buffer_t *rb, receive_buffer_mark_t *a, receive_buffer_mark_t *b, void **out_buf, size_t *out_size)
 {
         if (a->offset > b->offset)
@@ -123 +123 @@
 }
 
-errno_t recv_cut_str(receive_buffer_t *rb, receive_buffer_mark_t *a, receive_buffer_mark_t *b, char **out_buf)
+int recv_cut_str(receive_buffer_t *rb, receive_buffer_mark_t *a, receive_buffer_mark_t *b, char **out_buf)
 {
         if (a->offset > b->offset)
@@ -147 +147 @@
 
 /** Receive one character (with buffering) */
-errno_t recv_char(receive_buffer_t *rb, char *c, bool consume)
+int recv_char(receive_buffer_t *rb, char *c, bool consume)
 {
         if (rb->out == rb->in) {
@@ -170 +170 @@
                 
                 size_t nrecv;
-                errno_t rc = rb->receive(rb->client_data, rb->buffer + rb->in, free, &nrecv);
+                int rc = rb->receive(rb->client_data, rb->buffer + rb->in, free, &nrecv);
                 if (rc != EOK)
                         return rc;
@@ -183 +183 @@
 }
 
-errno_t recv_buffer(receive_buffer_t *rb, char *buf, size_t buf_size,
+int recv_buffer(receive_buffer_t *rb, char *buf, size_t buf_size,
     size_t *nrecv)
 {
@@ -200 +200 @@
 /** Receive a character and if it is c, discard it from input buffer
  * @param ndisc Place to store number of characters discarded
- * @return EOK or an error code
- */
-errno_t recv_discard(receive_buffer_t *rb, char discard, size_t *ndisc)
+ * @return EOK or error code
+ */
+int recv_discard(receive_buffer_t *rb, char discard, size_t *ndisc)
 {
         char c = 0;
-        errno_t rc = recv_char(rb, &c, false);
+        int rc = recv_char(rb, &c, false);
         if (rc != EOK)
                 return rc;
@@ -221 +221 @@
 /** Receive a prefix of constant string discard and return number of bytes read
  * @param ndisc Place to store number of characters discarded
- * @return EOK or an error code
- */
-errno_t recv_discard_str(receive_buffer_t *rb, const char *discard, size_t *ndisc)
+ * @return EOK or error code
+ */
+int recv_discard_str(receive_buffer_t *rb, const char *discard, size_t *ndisc)
 {
         size_t discarded = 0;
         while (*discard) {
                 size_t nd;
-                errno_t rc = recv_discard(rb, *discard, &nd);
+                int rc = recv_discard(rb, *discard, &nd);
                 if (rc != EOK)
                         return rc;
@@ -241 +241 @@
 }
 
-errno_t recv_while(receive_buffer_t *rb, char_class_func_t class)
+int recv_while(receive_buffer_t *rb, char_class_func_t class)
 {
         while (true) {
                 char c = 0;
-                errno_t rc = recv_char(rb, &c, false);
+                int rc = recv_char(rb, &c, false);
                 if (rc != EOK)
                         return rc;
@@ -264 +264 @@
  * @param nrecv Place to store number of bytes received (zero if
  *              no newline is present in the stream)
- * @return EOK on success or an error code
- */
-errno_t recv_eol(receive_buffer_t *rb, size_t *nrecv)
+ * @return EOK on success or error code
+ */
+int recv_eol(receive_buffer_t *rb, size_t *nrecv)
 {
         char c = 0;
-        errno_t rc = recv_char(rb, &c, false);
+        int rc = recv_char(rb, &c, false);
         if (rc != EOK)
                 return rc;
@@ -292 +292 @@
 
 /* Receive a single line */
-errno_t recv_line(receive_buffer_t *rb, char *line, size_t size, size_t *nrecv)
+int recv_line(receive_buffer_t *rb, char *line, size_t size, size_t *nrecv)
 {
         size_t written = 0;
@@ -299 +299 @@
         while (written < size) {
                 char c = 0;
-                errno_t rc = recv_char(rb, &c, true);
+                int rc = recv_char(rb, &c, true);
                 if (rc != EOK)
                         return rc;