*/
#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_noeof()
*/
#include "rexit.h" /* for exit_err(), exit_trouble() */
#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_log(),
/* 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). */
/* 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;
- exit_trouble(read_uint8(file, &a), f_name, "read_uint8()");
+ uint8_t a = try_fgetc_noeof(file, f_name);
try_fclose(file, f_name);
/* Toggle windows and set active window selection. */
if (0 != world.wmeta->active)
{
struct WinConf * wc = get_winconf_by_win(world.wmeta->active);
- write_uint8(wc->id, file);
+ try_fputc(wc->id, file, f_name);
}
try_fclose_unlink_rename(file, path_tmp, path, f_name);
}