X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Freadwrite.c;h=4bdf5ae3da5eb07038a0b88f06d63e4f34c892e9;hb=7290dec4219eaa2325aa00ef6139f715743dba3a;hp=657d8173dd674ecfa9528cfce9653ee5dd841449;hpb=fb8ddca6abc66eb7e52a007850689309b4cda938;p=plomrogue
diff --git a/src/readwrite.c b/src/readwrite.c
index 657d817..4bdf5ae 100644
--- a/src/readwrite.c
+++ b/src/readwrite.c
@@ -9,7 +9,7 @@
#include /* for unlink() */
#include "rexit.h" /* for exit_err() */
#include "misc.h" /* for trouble_msg() */
-struct World;
+#include "main.h" /* for world global */
@@ -33,7 +33,7 @@ static uint8_t write_uintX_bigendian(FILE * file, uint32_t x, uint8_t size);
-extern FILE * try_fopen(char * path, char * mode, struct World * w, char * f)
+extern FILE * try_fopen(char * path, char * mode, char * f)
{
char * msg1 = "Trouble in ";
char * msg2 = " with fopen() (mode '";
@@ -44,27 +44,26 @@ extern FILE * try_fopen(char * path, char * mode, struct World * w, char * f)
char msg[size];
sprintf(msg, "%s%s%s%s%s%s%s", msg1, f, msg2, mode, msg3, path, msg4);
FILE * file_p = fopen(path, mode);
- exit_err(NULL == file_p, w, msg);
+ exit_err(NULL == file_p, msg);
return file_p;
}
-extern void try_fclose(FILE * file, struct World * w, char * f)
+extern void try_fclose(FILE * file, char * f)
{
- char * msg = trouble_msg(w, f, "fclose()");
- exit_err(fclose(file), w, msg);
+ char * msg = trouble_msg(f, "fclose()");
+ exit_err(fclose(file), msg);
free(msg);
}
-extern char * try_fgets(char * line, int linemax, FILE * file,
- struct World * w, char * f)
+extern char * try_fgets(char * line, int linemax, FILE * file, char * f)
{
- char * msg = trouble_msg(w, f, "fgets()");
+ char * msg = trouble_msg(f, "fgets()");
char * test = fgets(line, linemax, file);
- exit_err(NULL == test && ferror(file), w, msg);
+ exit_err(NULL == test && ferror(file), msg);
free(msg);
return test;
}
@@ -72,19 +71,19 @@ extern char * try_fgets(char * line, int linemax, FILE * file,
extern void try_fwrite(void * ptr, size_t size, size_t nmemb, FILE * stream,
- struct World * w, char * f)
+ char * f)
{
- char * msg = trouble_msg(w, f, "fwrite()");
- exit_err(0 == fwrite(ptr, size, nmemb, stream), w, msg);
+ char * msg = trouble_msg(f, "fwrite()");
+ exit_err(0 == fwrite(ptr, size, nmemb, stream), msg);
free(msg);
}
extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
- struct World * w, char * f)
+ char * f)
{
- try_fclose(file, w, f);
+ try_fclose(file, f);
char * msg1 = "Trouble in ";
char * msg4 = "'.";
if (!access(p2, F_OK))
@@ -94,7 +93,7 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
+ strlen(f) + strlen(p2) + 1;
char msg[size];
sprintf(msg, "%s%s%s%s%s", msg1, f, msg2, p2, msg4);
- exit_err(unlink(p2), w, msg);
+ exit_err(unlink(p2), msg);
}
char * msg2 = " with rename() from '";
char * msg3 = "' to '";
@@ -102,16 +101,16 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
+ strlen(msg3) + strlen(p2) + strlen(msg4) + 1;
char msg[size];
sprintf(msg, "%s%s%s%s%s%s%s", msg1, f, msg2, p1, msg3, p2, msg4);
- exit_err(rename(p1, p2), w, msg);
+ exit_err(rename(p1, p2), msg);
}
-extern uint16_t get_linemax(FILE * file, struct World * w, char * f)
+extern uint16_t get_linemax(FILE * file, char * f)
{
- char * msg = trouble_msg(w, f, "textfile_sizes()");
+ char * msg = trouble_msg(f, "textfile_sizes()");
uint16_t linemax;
- exit_err(textfile_sizes(file, &linemax, NULL), w, msg);
+ exit_err(textfile_sizes(file, &linemax, NULL), msg);
free(msg);
return linemax;
}