X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=74bd4a202b5a96f73973e4f399985d5b37ec75ca;hb=e9ee94eeb27e1121f8383cb6fc3775f18261df75;hp=c89f897e72a4684d700fb95c2df25d4ba30bd6e4;hpb=d504e5724574f9502ec203d495284738601bb6a0;p=plomrogue

diff --git a/src/wincontrol.c b/src/wincontrol.c
index c89f897..74bd4a2 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -9,9 +9,9 @@
                       */
 #include "yx_uint16.h" /* for yx_uint16 struct */
 #include "main.h" /* for world global */
-#include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(),
+#include "readwrite.h" /* for textfile_sizes(), try_fopen(), try_fclose(),
                         * try_fgets(), try_fclose_unlink_rename(), try_fwrite()
-                        * try_fgetc()
+                        * try_fgetc_noeof()
                         */
 #include "rexit.h" /* for exit_err(), exit_trouble() */
 #include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_log(),
@@ -83,7 +83,7 @@ static void init_winconf_from_file(char id, struct WinConf * winconf)
     /* Prepare reading in file line by line into "line" array. */
     FILE * file = try_fopen(path, "r", context);
     free(path);
-    uint16_t linemax = get_linemax(file, context);
+    uint16_t linemax = textfile_sizes(file, NULL/*, context*/);
     char line[linemax + 1];
 
     /* Read/determine winconf->title, ->draw, ->height(_type),->width(_type). */
@@ -396,10 +396,10 @@ extern void sorted_wintoggle_and_activate()
     /* Read from file order of windows to be toggled + active win selection. */
     char * path = "config/windows/toggle_order_and_active";
     FILE * file = try_fopen(path, "r", f_name);
-    uint16_t linemax = get_linemax(file, f_name);
+    uint16_t linemax = textfile_sizes(file, NULL);
     char win_order[linemax + 1];
     try_fgets(win_order, linemax + 1, file, f_name);
-    uint8_t a = try_fgetc(file, f_name);
+    uint8_t a = try_fgetc_noeof(file, f_name);
     try_fclose(file, f_name);
 
     /* Toggle windows and set active window selection. */