Heavy refactoring of all file I/O and some memory handling; also repaired some incons...

[plomrogue] / src / misc.h

diff --git a/src/misc.h b/src/misc.h
index be431979360ace92538ac339fbc53c55f4a94337..5101e473521916bbfa16aa24c40249d8240f0f30 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -9,19 +9,31 @@
 
 
 
+#include <stdlib.h>    /* for size_t */
 #include <stdint.h>    /* for uint16_t */
-#include <stdio.h>     /* for FILE typedef */
 #include "yx_uint16.h" /* for yx_uint16 coordinates */
 struct World;
 struct Map;
 
 
 
-/* Learn from "file" the largest line length (pointed to by "linemax_p") and
- * (pointed to by "n_lines_p" if it is not set to NULL) the number of lines.
+/* Returns message: "Trouble in ".parent." with ".child."." (try_*() helper) */
+extern char * trouble_msg(struct World * w, char * parent, char * child);
+
+/* Wrappers to malloc(), calloc() from function called "f" calling exit_err()
+ * with trouble_msg() error message if necessary.
  */
-extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
-                           uint16_t * n_lines_p);
+extern void * try_malloc(size_t size, struct World * w, char * f);
+extern void * try_calloc(size_t nmemb, size_t size,
+                         struct World * w, char * f);
+
+
+
+/* Check if tempfile "path" exists, and if so, exit with explanation that. */
+extern void check_tempfile(char * path, struct World * f);
+
+/* If one and only one of files at "p1", "p2" exists, fail with explanation. */
+extern void check_files_xor(char * p1, char * p2, struct World * w);