memory handling

src/dexter.c

@@ -12,15 +12,11 @@
 #include <ctype.h>
 #include <stdbool.h>
 
-char* dex_parsing_context;
-int dex_debug_mode = 0;
-
 char* dex_set_debug_mode(int i) {
 	dex_debug_mode = i;
 }
 
 char* dex_compile(char* dex, char* incl) {
-	obstack_init (&dex_obstack);
 	fprintf(stderr, "obstack init\n");
 
 	struct json_object *json = json_tokener_parse(dex);
@@ -61,10 +57,14 @@ char* dex_compile(char* dex, char* incl) {
 	char* output = strdup(buf->buf);
 	printbuf_free(buf);
 	fprintf(stderr, "obstack free\n");
-	obstack_free(&dex_obstack, NULL);
 	return output;
 }
 
+
+void * __dex_alloc(int size) {
+	return obstack_alloc(&dex_obstack, size);
+}
+
 void __dex_recurse_object(struct json_object * json, struct printbuf* buf, char *context) {
 	char *tag;
 	char *ptr;

src/dexter.h

@@ -4,16 +4,21 @@
 #define DEX_BUF_SIZE 1024
 
 #include "obstack.h"
+
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
+
 static struct obstack dex_obstack;
+static char* dex_parsing_context;
+static int dex_debug_mode = 0;
 
 #include <json/json.h>
 
 char* dex_compile(char* dex, char* incl);
 char* dex_set_debug_mode(int);
 void dex_error(char*);
 
+void* __dex_alloc(int);
 void __dex_recurse(struct json_object *, struct printbuf*, char*);
 void __dex_recurse_object(struct json_object *, struct printbuf*, char*);
 void __dex_recurse_array(struct json_object *, struct printbuf*, char*);

src/kstring.c

@@ -11,44 +11,43 @@ char* astrdup(char* c) {
 }
 
 char* astrcat(char* a, char* b) {
-	// char* output = (char*) obstack_alloc(&dex_obstack, sizeof(char) * (strlen(a) + strlen(b) + 1));
-	char* output = (char*) malloc(sizeof(char) * (strlen(a) + strlen(b) + 1));
+	char* output = (char*) __dex_alloc(sizeof(char) * (strlen(a) + strlen(b) + 1));
 	sprintf(output, "%s%s", a, b);
   return output;
 }
 
 char* astrcat3(char* a, char* b, char* c) {
-	char* output = (char*) malloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + 1));
+	char* output = (char*) __dex_alloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + 1));
 	sprintf(output, "%s%s%s", a, b, c);
   return output;
 }
 
 char* astrcat4(char* a, char* b, char* c, char* d) {
-	char* output = (char*) malloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + 1));
+	char* output = (char*) __dex_alloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + 1));
 	sprintf(output, "%s%s%s%s", a, b, c, d);
   return output;
 }
 
 char* astrcat5(char* a, char* b, char* c, char* d, char* e) {
-	char* output = (char*) malloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + strlen(e) + 1));
+	char* output = (char*) __dex_alloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + strlen(e) + 1));
 	sprintf(output, "%s%s%s%s%s", a, b, c, d, e);
   return output;
 }
 
 char* astrcat6(char* a, char* b, char* c, char* d, char* e, char* f) {
-	char* output = (char*) malloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + strlen(e) + strlen(f) + 1));
+	char* output = (char*) __dex_alloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + strlen(e) + strlen(f) + 1));
 	sprintf(output, "%s%s%s%s%s%s", a, b, c, d, e, f);
   return output;
 }
 
 char* astrcat9(char* a, char* b, char* c, char* d, char* e, char* f, char* g, char* h, char* i) {
-	char* output = (char*) malloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + strlen(e) + strlen(f) + strlen(g) + strlen(h) + strlen(i) + 1));
+	char* output = (char*) __dex_alloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + strlen(e) + strlen(f) + strlen(g) + strlen(h) + strlen(i) + 1));
 	sprintf(output, "%s%s%s%s%s%s%s%s%s", a, b, c, d, e, f, g, h, i);
   return output;
 }
 
 char* astrcat10(char* a, char* b, char* c, char* d, char* e, char* f, char* g, char* h, char* i, char* j) {
-	char* output = (char*) malloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + strlen(e) + strlen(f) + strlen(g) + strlen(h) + strlen(i) + strlen(j) + 1));
+	char* output = (char*) __dex_alloc(sizeof(char) * (strlen(a) + strlen(b) + strlen(c) + strlen(d) + strlen(e) + strlen(f) + strlen(g) + strlen(h) + strlen(i) + strlen(j) + 1));
 	sprintf(output, "%s%s%s%s%s%s%s%s%s%s", a, b, c, d, e, f, g, h, i, j);
   return output;
 }