X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=db144d1131664e9b666b4415b00c50071d356f27;hb=2409e8ab623f8ef1452508b0fb4a4293692ed6a7;hp=74c9c2a297d6fc9e0fcca3c1afdd83855cd56e2c;hpb=f44e1046dd5fafc71ac481490633ae544c5e5b0c;p=plomrogue

diff --git a/src/wincontrol.c b/src/wincontrol.c
index 74c9c2a..db144d1 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -30,7 +30,8 @@ extern struct Win * init_win_from_file(struct World * world, char * w_name,
     free(path);
     exit_err(NULL == file, world, err);
     uint16_t linemax;
-    textfile_sizes(file, &linemax, NULL);
+    err = "Trouble in init_win_from_file() with textfile_sizes().";
+    exit_err(textfile_sizes(file, &linemax, NULL), world, err);
     char * line = malloc(linemax);
     err = "Trouble in init_win_from_file() with fgets().";
     exit_err(NULL == fgets(line, linemax, file), world, err);
@@ -46,8 +47,9 @@ extern struct Win * init_win_from_file(struct World * world, char * w_name,
     exit_err(fclose(file), world, err);
 
     struct WinMeta * wmeta = world->wins.meta;
-    struct Win * wp; // = malloc(sizeof(struct Win));
-    init_win(wmeta, &wp, title, height, width, world, f);
+    struct Win * wp;
+    err = "Trouble in init_win_from_file() with init_win().";
+    exit_err(init_win(wmeta, &wp, title, height, width, world, f), world, err);
     free(title);
     return wp;
 }
@@ -56,18 +58,16 @@ extern struct Win * init_win_from_file(struct World * world, char * w_name,
 
 extern void sorted_wintoggle(struct World * world)
 {
-    char * err = "Trouble in sorted_wintoggle() with fopen() on file "
-                 "'config/toggle_win_order'.";
+    char * err = "Trouble in sorted_wintoggle() with fopen().";
     FILE * file = fopen("config/windows/toggle_order", "r");
     exit_err(NULL == file, world, err);
     uint16_t linemax;
-    textfile_sizes(file, &linemax, NULL);
+    err = "Trouble in sorted_wintoggle() with textfile_sizes().";
+    exit_err(textfile_sizes(file, &linemax, NULL), world, err);
     char win_order[linemax];
-    err = "Trouble in sorted_wintoggle() with fgets() on file "
-          "'config/toggle_win_order'.";
+    err = "Trouble in sorted_wintoggle() with fgets().";
     exit_err(NULL == fgets(win_order, linemax, file), world, err);
-    err = "Trouble in sorted_wintoggle() with fclose() on file "
-          "'toggle_win_order'.";
+    err = "Trouble in sorted_wintoggle() with fclose().";
     exit_err(fclose(file), world, err);
 
     char c;