Changeset 4d4f656 in mainline for uspace/lib/http/src/response.c

Timestamp:

2013-09-26T20:50:52Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

408424e

Parents:

b623b68

Message:

libhttp: Add higher-level API for working with headers

File:

• uspace/lib/http/src/response.c (modified) (4 diffs)

uspace/lib/http/src/response.c

@@ -40 +40 @@
 
 #include <http/http.h>
+#include <http/errno.h>
 
 int http_parse_status(const char *line, http_version_t *out_version,
@@ -98 +99 @@
                 return ENOMEM;
         memset(resp, 0, sizeof(http_response_t));
-        list_initialize(&resp->headers);
+        http_headers_init(&resp->headers);
         
         char *line = malloc(http->buffer_size);
@@ -115 +116 @@
                 goto error;
         
-        while (true) {
-                rc = recv_eol(&http->recv_buffer);
-                if (rc < 0)
-                        goto error;
-                
-                /* Empty line ends header part */
-                if (rc > 0)
-                        break;
-                
-                http_header_t *header = malloc(sizeof(http_header_t));
-                if (header == NULL) {
-                        rc = ENOMEM;
-                        goto error;
-                }
-                http_header_init(header);
-                
-                rc = http_header_receive(&http->recv_buffer, header);
-                if (rc != EOK) {
-                        free(header);
-                        goto error;
-                }
-                
-                list_append(&header->link, &resp->headers);
-        }
+        rc = http_headers_receive(&http->recv_buffer, &resp->headers);
+        if (rc != EOK)
+                goto error;
+        
+        rc = recv_eol(&http->recv_buffer);
+        if (rc == 0)
+                rc = HTTP_EPARSE;
+        if (rc < 0)
+                goto error;
         
         *out_response = resp;
@@ -157 +143 @@
 {
         free(resp->message);
-        link_t *link = resp->headers.head.next;
-        while (link != &resp->headers.head) {
-                link_t *next = link->next;
-                http_header_t *header = list_get_instance(link, http_header_t, link);
-                http_header_destroy(header);
-                link = next;
-        }
+        http_headers_clear(&resp->headers);
         free(resp);
 }