Merge memory manager changes into trunk

FossilOrigin-Name: af583e3ba70b2d10efdead8e03a42fe5c1b94d6b387522833606c138b527a653

1 files changed, 24 insertions, 4 deletions

diff --git a/tests/aplwc_read.c b/tests/aplwc_read.c
index c54f598..d090494 100644
--- a/tests/aplwc_read.c
+++ b/tests/aplwc_read.c
@@ -1,18 +1,38 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <aplwc.h>
 
+static void *
+my_alloc(size_t min, size_t max, size_t *actual)
+{
+	(void)max;
+
+	*actual = min;
+	return malloc(min);
+}
+
+static void
+my_dealloc(void *p)
+{
+	free(p);
+}
+
 int
 main(int argc, char *argv[])
 {
-	uint8_t data[APLWC_MIN_MEM+1000];
+	struct aplwc_fns fns;
 	char *input;
 	struct aplwc *aplwc;
-	struct aplwc_line *line;
+	AplwcLine line;
 	enum aplwc_rc ret;
 	FILE *f;
 	long input_size;
 
+	memset(&fns, 0, sizeof(fns));
+	fns.alloc = my_alloc;
+	fns.dealloc = my_dealloc;
+
 	if(argc != 2)
 		return 1;
 
@@ -33,12 +53,12 @@ main(int argc, char *argv[])
 		return 1;
 	input[input_size] = 0;
 	
-	ret = aplwc_new(&aplwc, data, sizeof(data));
+	aplwc = aplwc_new(fns, &ret);
 	if(ret)
 		return 1;
 
 	line = aplwc_read(aplwc, input);
-	if((line == NULL) && (aplwc_last_error(aplwc) != APLWC_OUT_OF_MEMORY))
+	if((!aplwc_valid_line(line)) && (aplwc_last_error(aplwc) != APLWC_OUT_OF_MEMORY))
 		return 1;
 	aplwc_free_line(line);
 	aplwc_destroy(aplwc);