Final changes to be able to switch over to an autotools based setupautotools

FossilOrigin-Name: 6a01b406226d3f60ea7d86fc177296f8e0a6c1e0816264bac807e30d78edbf21

4 files changed, 32 insertions, 24 deletions

diff --git a/src/lib/memory.c b/src/lib/memory.c
index 051acba..a8317c7 100644
--- a/src/lib/memory.c
+++ b/src/lib/memory.c
@@ -41,7 +41,9 @@ struct chunk {
 	unsigned int last:1;
 };
 
+#if APLWC_BUILD_TYPE_DEBUG
 static void debug_check_mem(struct aplwc *);
+#endif /* APLWC_BUILD_TYPE_DEBUG */
 
 void
 memory_init(struct aplwc *aplwc)
@@ -436,27 +438,6 @@ compact(struct aplwc *aplwc)
 	}
 }
 
-static void
-debug_check_mem(struct aplwc *aplwc)
-{
-	uint64_t size;
-	struct chunk *c, *prev;
-
-	size = 0;
-	prev = NULL;
-	for(c = (struct chunk *)aplwc->data; c; prev = c, c = next(c)){
-		assert(((uint8_t*)c) < (aplwc->data+aplwc->size));
-		assert((c->size % ALIGNMENT) == 0);
-		assert(c->stack == NULL);
-		size += c->size;
-		assert((c->last == 0) != (size == aplwc->size));
-		if(c->tag == CHUNK_TAG_FREE)
-			assert((prev == NULL) || (prev->tag != CHUNK_TAG_FREE));
-	}
-	
-	assert(size == aplwc->size);
-}
-
 static void *
 alloc(struct aplwc *aplwc, size_t size, enum chunk_tag tag)
 {
@@ -653,3 +634,26 @@ valid_ref(struct aplwc_ref *ref)
 {
 	return (ref->aplwc != NULL) && (ref->ptr != NULL);
 }
+
+#if APLWC_BUILD_TYPE_DEBUG
+static void
+debug_check_mem(struct aplwc *aplwc)
+{
+	uint64_t size;
+	struct chunk *c, *prev;
+
+	size = 0;
+	prev = NULL;
+	for(c = (struct chunk *)aplwc->data; c; prev = c, c = next(c)){
+		assert(((uint8_t*)c) < (aplwc->data+aplwc->size));
+		assert((c->size % ALIGNMENT) == 0);
+		assert(c->stack == NULL);
+		size += c->size;
+		assert((c->last == 0) != (size == aplwc->size));
+		if(c->tag == CHUNK_TAG_FREE)
+			assert((prev == NULL) || (prev->tag != CHUNK_TAG_FREE));
+	}
+	
+	assert(size == aplwc->size);
+}
+#endif /* APLWC_BUILD_TYPE_DEBUG */
diff --git a/src/lib/module.c b/src/lib/module.c
index 2ef5ba3..aaa9634 100644
--- a/src/lib/module.c
+++ b/src/lib/module.c
@@ -67,6 +67,7 @@ read_keyword_decl(struct aplwc *aplwc, struct aplwc_module *module, size_t offse
 
 	max = module->tokens->length - offset - 1;
 
+	len = -1;
 	assert(t(0).tag == TOKEN_TAG_KEYWORD);
 	switch(t(0).data.keyword){
 	case KW_MODULE:
diff --git a/src/lib/syntax.c b/src/lib/syntax.c
index 4850b1a..1740a4e 100644
--- a/src/lib/syntax.c
+++ b/src/lib/syntax.c
@@ -425,6 +425,7 @@ scan_string(struct aplwc *aplwc, struct string *text, int oneline)
 	MEMPTR(0, text);
 
 	tokens = NULL;
+	n = 0;
 	if((rc = check(aplwc, text, &n)) != APLWC_OK)
 		goto end;
 
diff --git a/src/tools/genboot.c b/src/tools/genboot.c
index 6f2e408..e89b3aa 100644
--- a/src/tools/genboot.c
+++ b/src/tools/genboot.c
@@ -4,14 +4,16 @@
 int
 main(int argc, char *argv[])
 {
+	FILE *f;
+	int c, s;
+
 	assert(argc == 2);
-	FILE *f = fopen(argv[1], "r");
+	f = fopen(argv[1], "r");
 	assert(f != NULL);
 
 	printf("unsigned char boot_src[] = { ");
 
-	int c;
-	int s = 0;
+	s = 0;
 	while((c = fgetc(f)) != EOF){
 		if(s++ > 0)
 			printf(", ");