X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Frbuf%2Ftest%2Frun-partial-read.c;h=727fade8abdc9a8e2e86e76b2c1fc6678413bbd4;hp=362e6b60171aad27a750434a56d6bc15df1d2d0f;hb=d8a270fdfc57ffe7603028ecda99eeab3889ca70;hpb=44b37ee8aeb185f6837378fef17d887bda6ff89b

diff --git a/ccan/rbuf/test/run-partial-read.c b/ccan/rbuf/test/run-partial-read.c
index 362e6b60..727fade8 100644
--- a/ccan/rbuf/test/run-partial-read.c
+++ b/ccan/rbuf/test/run-partial-read.c
@@ -27,7 +27,7 @@ int main(void)
 	int i, fd = open("test/run.c", O_RDONLY);
 
 	/* This is how many tests you plan to run */
-	plan_tests(140);
+	plan_tests(160);
 
 	/* Grab ourselves for comparison. */
 	buf[full_read(fd, buf, sizeof(buf))] = '\0';
@@ -41,26 +41,26 @@ int main(void)
 	}
 	lines[i] = NULL;
 
-	rbuf_init(&in, fd, malloc(31), 31);
+	rbuf_init(&in, fd, malloc(31), 31, membuf_realloc);
 	ok1(in.fd == fd);
-	ok1(in.buf_end - in.buf == 31);
-	p = rbuf_read_str(&in, '\n', NULL);
+	ok1(membuf_num_space(&in.m) == 31);
+	p = rbuf_read_str(&in, '\n');
 	ok1(p);
 	ok1(strcmp(p, lines[0]) == 0);
 
-	p = rbuf_read_str(&in, '\n', realloc);
+	p = rbuf_read_str(&in, '\n');
 	ok1(p);
 	ok1(strcmp(p, lines[1]) == 0);
 
 	for (i = 2; lines[i]; i++) {
-		ok1(p = rbuf_read_str(&in, '\n', realloc));
+		ok1(p = rbuf_read_str(&in, '\n'));
 		ok1(strcmp(p, lines[i]) == 0);
 	}
 
-	p = rbuf_read_str(&in, '\n', realloc);
+	p = rbuf_read_str(&in, '\n');
 	ok1(errno == 0);
 	ok1(p == NULL);
-	free(in.buf);
+	free(membuf_cleanup(&in.m));
 
 	/* This exits depending on whether all tests passed */
 	return exit_status();