[commonlib.h] TODO Done: Refactor slurp_file error msgs.

diff --git a/commonlib.h b/commonlib.h
index 916ac3cdcfcb1edc51576c58d3dbd68f1df4f3b9..7456fe7b257c4f9b821dde8fd33cd1b7ce767e7e 100644 (file)
--- a/commonlib.h
+++ b/commonlib.h
@@ -331,42 +331,41 @@ bool c_os_file_exists(cstr filename) {
     result = ret_val;\\r
     goto defer\r
 \r
-// TODO: Refactor error messages\r
 const char *c_slurp_file(const char* filename, bool* success) {\r
     FILE* f = fopen(filename, "rb");\r
     char* result = NULL;\r
 \r
     if (f == NULL){\r
-        c_log_error("slurp_file::fopen(\"%s\", \"rb\") -> %s\n", filename, strerror(errno));\r
+        c_log_error("'%s': %s", filename, strerror(errno));\r
         defer(NULL);\r
     }\r
 \r
     if (fseek(f, 0, SEEK_END) < 0) {\r
-        c_log_error("slurp_file::fseek(%s, 0, SEEK_END) -> %s\n", filename, strerror(errno));\r
+        c_log_error("'%s': %s", filename, strerror(errno));\r
         defer(NULL);\r
     }\r
 \r
     size_t fsize = ftell(f);\r
 \r
     if (fsize == (size_t)-1){\r
-        c_log_error("slurp_file::ftell(%s) -> %s\n", filename, strerror(errno));\r
+        c_log_error("'%s': %s", filename, strerror(errno));\r
         defer(NULL);\r
     }\r
 \r
     result = C_MALLOC(sizeof(char)*(fsize+1));\r
 \r
     if (result == NULL){\r
-        c_log_error("slurp_file::malloc(%zu) -> %s\n", sizeof(char)*fsize, strerror(errno));\r
+        c_log_error("'%s': %s", filename, strerror(errno));\r
         defer(NULL);\r
     }\r
 \r
     if (fseek(f, 0, SEEK_SET) < 0) {\r
-        c_log_error("slurp_file::fseek(%s, 0, SEEK_SET) -> %s\n", filename, strerror(errno));\r
+        c_log_error("'%s': %s", filename, strerror(errno));\r
         defer(NULL);\r
     }\r
 \r
     if (fread((char*)result, sizeof(char), fsize, f) != fsize){\r
-        c_log_error("slurp_file::fread(result, %zu, 1, f) -> %s\n", fsize, strerror(errno));\r
+        c_log_error("'%s': %s", filename, strerror(errno));\r
         defer(NULL);\r
     }\r
 \r