Migrate level parsing to linestream-less mechanism

[nothing.git] / src / system / file.c

diff --git a/src/system/file.c b/src/system/file.c
index adc9acad6942954a7704ff3a1c6672f526cc7afd..706535f69a49106f277a32dc5eb0a74fadf05ce4 100644 (file)
--- a/src/system/file.c
+++ b/src/system/file.c
@@ -75,7 +75,7 @@ void closedir(DIR *dirp)
 
 #endif
 
-String read_whole_file(const char *filepath)
+String read_whole_file(Memory *memory, const char *filepath)
 {
     trace_assert(filepath);
 
@@ -85,8 +85,9 @@ String read_whole_file(const char *filepath)
     if (fseek(f, 0, SEEK_END) < 0) goto end;
     long m = ftell(f);
     if (m < 0) goto end;
+    if (fseek(f, 0, SEEK_SET) < 0) goto end;
     result.count = (size_t) m;
-    char *buffer = nth_calloc(1, result.count);
+    char *buffer = memory_alloc(memory, result.count);
     size_t n = fread(buffer, 1, result.count, f);
     trace_assert(n == result.count);
     result.data = buffer;