about summary refs log tree commit homepage
path: root/test/chunk-parser-1.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/chunk-parser-1.c')
-rw-r--r--test/chunk-parser-1.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/test/chunk-parser-1.c b/test/chunk-parser-1.c
index 6804a17..335a39b 100644
--- a/test/chunk-parser-1.c
+++ b/test/chunk-parser-1.c
@@ -23,7 +23,7 @@ static void buf_set(const char *s)
 {
         struct mog_file *file;
 
-        http->chunked = 1;
+        http->_p.chunked = 1;
         reset();
         tmpfp = tmpfile();
         assert(tmpfp != NULL && "tmpfile(3) failed");
@@ -46,16 +46,16 @@ int main(void)
                 buf_set("666\r\n");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_DONE);
-                assert(http->content_len == 0x666);
-                assert(http->chunk_state == MOG_CHUNK_STATE_DATA);
+                assert(http->_p.content_len == 0x666);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_DATA);
         }
 
         if ("incomplete chunk") {
                 buf_set("666\r");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_CONTINUE);
-                assert(http->content_len == 0x666);
-                assert(http->chunk_state == MOG_CHUNK_STATE_SIZE);
+                assert(http->_p.content_len == 0x666);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_SIZE);
         }
 
         if ("bad chunk") {
@@ -68,8 +68,8 @@ int main(void)
                 buf_set("abcde; foo=bar\r\n");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_DONE);
-                assert(http->content_len == 0xabcde);
-                assert(http->chunk_state == MOG_CHUNK_STATE_DATA);
+                assert(http->_p.content_len == 0xabcde);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_DATA);
         }
 
         if ("chunk with complete header and data") {
@@ -77,8 +77,8 @@ int main(void)
                 buf_set("5\r\nabcde");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_CONTINUE);
-                assert(http->content_len == 0);
-                assert(http->chunk_state == MOG_CHUNK_STATE_SIZE);
+                assert(http->_p.content_len == 0);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_SIZE);
                 assert(sizeof(tmp) == pread(tmpfd, tmp, sizeof(tmp), 0));
                 assert(0 == memcmp(tmp, "abcde", sizeof(tmp)));
         }
@@ -88,33 +88,33 @@ int main(void)
                 buf_set("5\r\nabcde\r\n3");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_CONTINUE);
-                assert(http->content_len == 3);
-                assert(http->chunk_state == MOG_CHUNK_STATE_SIZE);
+                assert(http->_p.content_len == 3);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_SIZE);
                 assert(sizeof(tmp) == pread(tmpfd, tmp, sizeof(tmp), 0));
                 assert(0 == memcmp(tmp, "abcde", sizeof(tmp)));
-                assert(http->offset == len);
+                assert(http->_p.offset == len);
         }
         if ("multiple chunks with end") {
                 char tmp[8];
                 buf_set("5\r\nabcde\r\n3\r\n123\r\n0\r\n\r\n");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_DONE);
-                assert(http->chunk_state == MOG_CHUNK_STATE_DONE);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_DONE);
                 assert(sizeof(tmp) == pread(tmpfd, tmp, sizeof(tmp), 0));
                 assert(0 == memcmp(tmp, "abcde123", sizeof(tmp)));
-                assert(http->offset == len);
+                assert(http->_p.offset == len);
         }
 
         if ("multiple chunks with trailer") {
                 char tmp[8];
                 buf_set("5\r\nabcde\r\n3\r\n123\r\n0\r\nFoo: bar\r\n\r\n");
                 state = mog_chunk_parse(http, buf, len);
-                assert(http->chunk_state == MOG_CHUNK_STATE_DONE);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_DONE);
                 assert(state == MOG_PARSER_DONE);
-                assert(http->content_len == 0);
+                assert(http->_p.content_len == 0);
                 assert(sizeof(tmp) == pread(tmpfd, tmp, sizeof(tmp), 0));
                 assert(0 == memcmp(tmp, "abcde123", sizeof(tmp)));
-                assert(http->offset == len);
+                assert(http->_p.offset == len);
         }
 
         if ("multiple chunks with almost end") {
@@ -122,11 +122,11 @@ int main(void)
                 buf_set("5\r\nabcde\r\n3\r\n123\r\n0\r\n");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_DONE);
-                assert(http->chunk_state == MOG_CHUNK_STATE_DATA);
-                assert(http->content_len == 0);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_DATA);
+                assert(http->_p.content_len == 0);
                 assert(sizeof(tmp) == pread(tmpfd, tmp, sizeof(tmp), 0));
                 assert(0 == memcmp(tmp, "abcde123", sizeof(tmp)));
-                assert(http->offset == len);
+                assert(http->_p.offset == len);
         }
 
         if ("multiple chunks with almost end (more)") {
@@ -134,11 +134,11 @@ int main(void)
                 buf_set("5\r\nabcde\r\n3\r\n123\r\n0\r\n\r");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_CONTINUE);
-                assert(http->chunk_state == MOG_CHUNK_STATE_TRAILER);
-                assert(http->content_len == 0);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_TRAILER);
+                assert(http->_p.content_len == 0);
                 assert(sizeof(tmp) == pread(tmpfd, tmp, sizeof(tmp), 0));
                 assert(0 == memcmp(tmp, "abcde123", sizeof(tmp)));
-                assert(http->offset == len);
+                assert(http->_p.offset == len);
         }
 
         if ("multiple chunks with incomplete") {
@@ -146,11 +146,11 @@ int main(void)
                 buf_set("5\r\nabcde\r\n3\r\n12");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_DONE);
-                assert(http->chunk_state == MOG_CHUNK_STATE_DATA);
-                assert(http->content_len == 1);
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_DATA);
+                assert(http->_p.content_len == 1);
                 assert(sizeof(tmp) == pread(tmpfd, tmp, sizeof(tmp), 0));
                 assert(0 == memcmp(tmp, "abcde12", sizeof(tmp)));
-                assert(http->offset == len);
+                assert(http->_p.offset == len);
         }
 
         if ("incomplete data") {
@@ -158,11 +158,11 @@ int main(void)
                 buf_set("666\r\nabc");
                 state = mog_chunk_parse(http, buf, len);
                 assert(state == MOG_PARSER_DONE);
-                assert(http->chunk_state == MOG_CHUNK_STATE_DATA);
-                assert(http->content_len == (0x666 - sizeof(tmp)));
+                assert(http->_p.chunk_state == MOG_CHUNK_STATE_DATA);
+                assert(http->_p.content_len == (0x666 - sizeof(tmp)));
                 assert(sizeof(tmp) == pread(tmpfd, tmp, sizeof(tmp), 0));
                 assert(0 == memcmp(tmp, "abc", sizeof(tmp)));
-                assert(http->offset == len);
+                assert(http->_p.offset == len);
         }
 
         reset();