1 files changed, 25 insertions, 23 deletions

diff --git a/tests.c b/tests.c
index 2cc9128..cea6911 100644
--- a/tests.c
+++ b/tests.c
@@ -47,57 +47,57 @@ void test_simple_proto()
 {
   /* These are the examples from
    * http://code.google.com/apis/protocolbuffers/docs/encoding.html */
-  struct pbstream_fieldset *fieldset1 = malloc(sizeof(*fieldset1) +
-                                               sizeof(struct pbstream_field[2]));
-  fieldset1->num_fields = 2;
-  fieldset1->fields[0].field_number = 1;
-  fieldset1->fields[0].type = PBSTREAM_TYPE_INT32;
-  fieldset1->fields[1].field_number = 2;
-  fieldset1->fields[1].type = PBSTREAM_TYPE_STRING;
+  struct pbstream_field *fields1 = malloc(sizeof(struct pbstream_field[2]));
+  fields1[0].field_number = 1;
+  fields1[0].type = PBSTREAM_TYPE_INT32;
+  fields1[1].field_number = 2;
+  fields1[1].type = PBSTREAM_TYPE_STRING;
+  struct pbstream_fieldset fieldset1;
+  pbstream_init_fieldset(&fieldset1, fields1, 2);
 
   char message1[] = {0x08, 0x96, 0x01};
   struct pbstream_parse_state s;
-  pbstream_init_parser(&s, fieldset1);
+  pbstream_init_parser(&s, &fieldset1);
   assert(s.offset == 0);
   pbstream_field_number_t fieldnum;
   struct pbstream_value val;
   struct pbstream_wire_value wv;
   assert(pbstream_parse_field(&s, message1, &fieldnum, &val, &wv) ==
          PBSTREAM_STATUS_OK);
-  assert(val.field == &fieldset1->fields[0]);
+  assert(val.field->field_number == 1);
   assert(val.v.int32 == 150);
   assert(s.offset == 3);
 
   char message2[] = {0x12, 0x07, 0x74, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67};
-  pbstream_init_parser(&s, fieldset1);
+  pbstream_init_parser(&s, &fieldset1);
   assert(pbstream_parse_field(&s, message2, &fieldnum, &val, &wv) ==
          PBSTREAM_STATUS_OK);
-  assert(val.field == &fieldset1->fields[1]);
+  assert(val.field->field_number == 2);
   assert(val.v.delimited.offset == 2);
   assert(val.v.delimited.len == 7);
   assert(s.offset == 9);
 
-  struct pbstream_fieldset *fieldset2 = malloc(sizeof(*fieldset1) +
-                                               sizeof(struct pbstream_field[3]));
-  fieldset2->num_fields = 3;
-  fieldset2->fields[2].field_number = 3;
-  fieldset2->fields[2].type = PBSTREAM_TYPE_MESSAGE;
-  fieldset2->fields[2].fieldset = fieldset1;
+  struct pbstream_field *fields2 = malloc(sizeof(struct pbstream_field[1]));
+  fields2[0].field_number = 3;
+  fields2[0].type = PBSTREAM_TYPE_MESSAGE;
+  fields2[0].fieldset = &fieldset1;
+  struct pbstream_fieldset fieldset2;
+  pbstream_init_fieldset(&fieldset2, fields2, 1);
   char message3[] = {0x1a, 0x03, 0x08, 0x96, 0x01};
-  pbstream_init_parser(&s, fieldset2);
+  pbstream_init_parser(&s, &fieldset2);
   assert(pbstream_parse_field(&s, message3, &fieldnum, &val, &wv) ==
          PBSTREAM_STATUS_OK);
-  assert(val.field == &fieldset2->fields[2]);
+  assert(val.field->field_number == 3);
   assert(val.v.delimited.offset == 2);
   assert(val.v.delimited.len == 3);
   assert(s.offset == 2);
   assert(s.top-1 == s.stack);
-  assert(s.top->fieldset == fieldset1);
+  assert(s.top->fieldset == &fieldset1);
   assert(s.top->end_offset == 5);
 
   assert(pbstream_parse_field(&s, message3+s.offset, &fieldnum, &val, &wv) ==
          PBSTREAM_STATUS_OK);
-  assert(val.field == &fieldset1->fields[0]);
+  assert(val.field->field_number == 1);
   assert(val.v.int32 == 150);
   assert(s.offset == 5);
 
@@ -106,8 +106,10 @@ void test_simple_proto()
          PBSTREAM_STATUS_SUBMESSAGE_END);
   assert(s.top == s.stack);
 
-  free(fieldset1);
-  free(fieldset2);
+  pbstream_free_fieldset(&fieldset1);
+  pbstream_free_fieldset(&fieldset2);
+  free(fields1);
+  free(fields2);
 }
 
 int main()