1 files changed, 15 insertions, 15 deletions

diff --git a/test/core/buffer-test.c b/test/core/buffer-test.c
index a102b01..72aff97 100644
--- a/test/core/buffer-test.c
+++ b/test/core/buffer-test.c
@@ -19,9 +19,9 @@ int main(int argc, char *argv[]) {
 
 	plan_no_plan();
 
-	ok(buffer_content(&buf) == NULL && buffer_length(&buf) == 0 && buffer_capacity(&buf) == 0, "Initialization");
-	ok(buffer_insert(&buf, 0, "foo", 0) && buffer_content(&buf) == NULL &&
-	   buffer_length(&buf) == 0 && buffer_capacity(&buf) == 0, "Insert zero length data");
+	ok(buf.data == NULL && buf.len == 0 && buf.size == 0, "Initialization");
+	ok(buffer_insert(&buf, 0, "foo", 0) && buf.data == NULL &&
+	   buf.len == 0 && buf.size == 0, "Insert zero length data");
 	ok(!buffer_insert0(&buf, 1, "foo"), "Insert string at invalid position");
 
 	ok(buffer_insert0(&buf, 0, "") && compare0(&buf, ""), "Insert empty string");
@@ -36,16 +36,16 @@ int main(int argc, char *argv[]) {
 	ok(buffer_append0(&buf, "baz") && compare0(&buf, "foobarbaz"), "Append string");
 
 	buffer_release(&buf);
-	ok(buf.data == NULL && buffer_length(&buf) == 0 && buffer_capacity(&buf) == 0, "Release");
+	ok(buf.data == NULL && buf.len == 0 && buf.size == 0, "Release");
 
 	ok(buffer_insert(&buf, 0, "foo", 0) && compare(&buf, "", 0), "Insert zero length data");
 	ok(buffer_insert(&buf, 0, "foo", 3) && compare(&buf, "foo", 3), "Insert data at start");
 	ok(buffer_insert(&buf, 1, "l", 1) && compare(&buf, "floo", 4), "Insert data in middle");
 	ok(buffer_insert(&buf, 4, "r", 1) && compare(&buf, "floor", 5), "Insert data at end");
 
-	size_t cap = buffer_capacity(&buf);
-	buffer_clear(&buf);
-	ok(buf.data && buffer_length(&buf) == 0 && buffer_capacity(&buf) == cap, "Clear");
+	size_t cap = buf.size;
+	buf.len = 0;
+	ok(buf.data && buf.len == 0 && buf.size == cap, "Clear");
 
 	ok(buffer_put(&buf, "foo", 0) && compare(&buf, "", 0), "Put zero length data");
 	ok(buffer_put(&buf, "bar", 3) && compare(&buf, "bar", 3), "Put data");
@@ -53,34 +53,34 @@ int main(int argc, char *argv[]) {
 	ok(buffer_prepend(&buf, "foo\0", 4) && compare(&buf, "foo\0bar", 7), "Prepend data");
 	ok(buffer_append(&buf, "\0baz", 4) && compare(&buf, "foo\0bar\0baz", 11), "Append data");
 
-	ok(buffer_grow(&buf, cap+1) && compare(&buf, "foo\0bar\0baz", 11) && buffer_capacity(&buf) >= cap+1, "Grow");
+	ok(buffer_grow(&buf, cap+1) && compare(&buf, "foo\0bar\0baz", 11) && buf.size >= cap+1, "Grow");
 
-	const char *content = buffer_content(&buf);
+	const char *content = buf.data;
 	char *data = buffer_move(&buf);
-	ok(data == content && buffer_length(&buf) == 0 && buffer_capacity(&buf) == 0 && buffer_content(&buf) == NULL, "Move");
-	ok(buffer_append0(&buf, "foo") && buffer_content(&buf) != data, "Modify after move");
+	ok(data == content && buf.len == 0 && buf.size == 0 && buf.data == NULL, "Move");
+	ok(buffer_append0(&buf, "foo") && buf.data != data, "Modify after move");
 	free(data);
 
 	skip_if(TIS_INTERPRETER, 1, "vsnprintf not supported") {
 
 		ok(buffer_printf(&buf, "Test: %d\n", 42) && compare0(&buf, "Test: 42\n"), "Set formatted");
 		ok(buffer_printf(&buf, "%d\n", 42) && compare0(&buf, "42\n"), "Set formatted overwrite");
-		buffer_clear(&buf);
+		buf.len = 0;
 
 		ok(buffer_printf(&buf, "%s", "") && compare0(&buf, ""), "Set formatted empty string");
-		buffer_clear(&buf);
+		buf.len = 0;
 
 		bool append = true;
 		for (int i = 1; i <= 10; i++)
 			append &= buffer_appendf(&buf, "%d", i);
 		ok(append && compare0(&buf, "12345678910"), "Append formatted");
-		buffer_clear(&buf);
+		buf.len = 0;
 
 		append = true;
 		for (int i = 1; i <= 10; i++)
 			append &= buffer_appendf(&buf, "%s", "");
 		ok(append && compare0(&buf, ""), "Append formatted empty string");
-		buffer_clear(&buf);
+		buf.len = 0;
 	}
 
 	buffer_release(&buf);