Remove the struct memory struct

FossilOrigin-Name: 38568a34f631b2a4eef72542e2988a9fe081f85d3248194c2ff995a9eed6bd5d

1 files changed, 19 insertions, 21 deletions

diff --git a/src/lib/aplwc_internal.h b/src/lib/aplwc_internal.h
index e394bd8..2e3e274 100644
--- a/src/lib/aplwc_internal.h
+++ b/src/lib/aplwc_internal.h
@@ -8,16 +8,14 @@
 #include <stdbool.h>
 #include <string.h>
 
-struct memory {
-	uint8_t *data;
-	size_t size;
-	size_t offset;
-};
-
 struct aplwc {
 	enum aplwc_rc last_error;
-	struct memory memory;
 	struct aplwc_module *modules;
+
+	/* Memory management */
+	uint8_t *data;
+	size_t size;
+	size_t offset;
 };
 
 struct aplwc_line {
@@ -81,20 +79,20 @@ struct aplwc_module {
 struct aplwc_value *eval_line(struct aplwc_line *);
 
 /* memory.c */
-struct memory memory_init(uint8_t *, size_t);
-struct aplwc *memory_alloc_aplwc(struct memory *);
-struct aplwc_line *memory_alloc_aplwc_line(struct memory *);
-struct string *memory_alloc_string(struct memory *, size_t);
-struct token_list *memory_alloc_token_list(struct memory *, size_t);
-struct aplwc_value *memory_alloc_aplwc_value(struct memory *);
-struct aplwc_module *memory_alloc_aplwc_module(struct memory *);
-struct module_imports *memory_alloc_module_imports(struct memory *, size_t);
-void memory_free_aplwc(struct memory *, struct aplwc *);
-void memory_free_aplwc_line(struct memory *, struct aplwc_line *);
-void memory_free_string(struct memory *, struct string *);
-void memory_free_token_list(struct memory *, struct token_list *);
-void memory_free_aplwc_value(struct memory *, struct aplwc_value *);
-void memory_free_aplwc_module(struct memory *, struct aplwc_module *);
+void memory_init(struct aplwc *, uint8_t *, size_t);
+struct aplwc *memory_alloc_aplwc(struct aplwc *);
+struct aplwc_line *memory_alloc_aplwc_line(struct aplwc *);
+struct string *memory_alloc_string(struct aplwc *, size_t);
+struct token_list *memory_alloc_token_list(struct aplwc *, size_t);
+struct aplwc_value *memory_alloc_aplwc_value(struct aplwc *);
+struct aplwc_module *memory_alloc_aplwc_module(struct aplwc *);
+struct module_imports *memory_alloc_module_imports(struct aplwc *, size_t);
+void memory_free_aplwc(struct aplwc *, struct aplwc *);
+void memory_free_aplwc_line(struct aplwc *, struct aplwc_line *);
+void memory_free_string(struct aplwc *, struct string *);
+void memory_free_token_list(struct aplwc *, struct token_list *);
+void memory_free_aplwc_value(struct aplwc *, struct aplwc_value *);
+void memory_free_aplwc_module(struct aplwc *, struct aplwc_module *);
 
 /* string.c */
 struct string *chars_to_string(struct aplwc *, const char *, int len);