fixing c headers

sjml · Nov 17, 2024 · 464bc8d · 464bc8d
1 parent f55f91a
commit 464bc8d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/beschi/writers/boilerplate/C.0.h b/beschi/writers/boilerplate/C.0.h
@@ -6,8 +6,10 @@
 #ifndef INCLUDE_BESCHI_H
 #define INCLUDE_BESCHI_H
 
-#include <stdbool.h>
+#include <stdlib.h>
+#include <stddef.h>
 #include <stdint.h>
+#include <stdbool.h>
 
 typedef uint8_t beschi_err_t;
 #define BESCHI_ERR_OK  0

diff --git a/beschi/writers/boilerplate/C.1.h b/beschi/writers/boilerplate/C.1.h
@@ -131,9 +131,10 @@ beschi_err_t beschi__ReadString(beschi_DataAccess *r, char **s, {# STRING_SIZE_T
     if (r->bufferSize < r->position + *len) {
         return BESCHI_ERR_EOF;
     }
-    *s = (char*)calloc(1, (size_t)(*len + 1));
+    *s = (char*)BESCHI_MALLOC((size_t)(*len + 1));
     if (*s == NULL) { return BESCHI_ERR_ALLOCATION_FAILURE; }
     memcpy(*s, r->buffer + r->position, *len);
+    (*s)[*len] = '\0';
     r->position += *len;
     return BESCHI_ERR_OK;
 }

diff --git a/docs/dev/todo.md b/docs/dev/todo.md
@@ -2,7 +2,6 @@ This file is a rough todo list for the tool itself.
 
 ## dustoff notes
 - add endian handling to C writer for the sake of completion
-- GCC has found some more warnings if -Wextra is turned on; look at those
 - test suite for destroying and cleaning up messages
 - add notes about trustworthiness
   - all reading code assumes it's reading stuff that was written by a corresponding writer