Made single World struct a global variable, fitted a lot of code to this change,...

[plomrogue] / src / readwrite.h

diff --git a/src/readwrite.h b/src/readwrite.h
index 5832a768a5f0659c9e9d9c67ea6d744e191b5596..2810820d57765868a780686c0dc0ad403ca0ada9 100644 (file)
--- a/src/readwrite.h
+++ b/src/readwrite.h
@@ -6,21 +6,26 @@
 #ifndef READWRITE_H
 #define READWRITE_H
 
-
-
 #include <stdio.h> /* for FILE typedef */
 #include <stdint.h> /* for uint8_t, uint16_t, uint32_t */
-struct World;
 
 
 
-/* Wrappers to calling from function called "f" of fopen(), fclose() and fgets()
- * and calling exit_err() with appropriate error messages.
+/* Wrappers to calling from function called "f" of fopen(), fclose(), fgets()
+ * and fwrite() and calling exit_err() with appropriate error messages.
+ */
+extern FILE * try_fopen(char * path, char * mode, char * f);
+extern void try_fclose(FILE * file, char * f);
+extern void try_fwrite(void * ptr, size_t size, size_t nmemb, FILE * stream,
+                       char * f);
+
+
+
+/* Wrapper to calling fgets() from function called "f". The return code of
+ * fgets() is returned unless it is NULL *and* ferror() indicates that an error
+ * occured; otherwise end of file is assumed and NULL is returned properly.
  */
-extern FILE * try_fopen(char * path, char * mode, struct World * w, char * f);
-extern void try_fclose(FILE * file, struct World * w, char * f);
-extern void try_fgets(char * line, int size, FILE * file,
-                      struct World * w, char * f);
+extern char * try_fgets(char * line, int size, FILE * file, char * f);
 
 
 
@@ -29,7 +34,7 @@ extern void try_fgets(char * line, int size, FILE * file,
  * Used for handling atomic saving of files via temp files.
  */
 extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
-                                     struct World * w, char * f);
+                                     char * f);
 
 
 
@@ -37,7 +42,7 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
  * length of "file", exit via exit_err() with trouble_msg()-generated error
  * message on failure.
  */
-extern uint16_t get_linemax(FILE * file, struct World * w, char * f);
+extern uint16_t get_linemax(FILE * file, char * f);
 
 
 
@@ -64,4 +69,6 @@ extern uint8_t write_uint8(uint8_t x, FILE * file);
 extern uint8_t write_uint16_bigendian(uint16_t x, FILE * file);
 extern uint8_t write_uint32_bigendian(uint32_t x, FILE * file);
 
+
+
 #endif