X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=inline;f=src%2Fwincontrol.c;h=c88c56b8bd5f075e4008acc907eeea40ef7b302e;hb=140cadf8f8dc73a1756169dbfa7cb5f05e3b8b8c;hp=5ebc0573c60592218449174c2ff53de87a5653ba;hpb=918a7b6c22411b67f5c5aa2aa4d1c166ad765aca;p=plomrogue diff --git a/src/wincontrol.c b/src/wincontrol.c index 5ebc057..c88c56b 100644 --- a/src/wincontrol.c +++ b/src/wincontrol.c @@ -4,7 +4,6 @@ #include /* for free() */ #include /* for strlen(), strchr(), strstr() */ #include /* for uint8_t, uint16_t */ -#include /* for fwrite() */ #include /* for access(), unlink() */ #include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(), * resize_active_win(), init_win(), free_win(), @@ -13,7 +12,7 @@ #include "yx_uint16.h" /* for yx_uint16 struct */ #include "main.h" /* for Wins struct */ #include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(), - * try_fgets(), try_fclose_unlink_rename() + * try_fgets(), try_fclose_unlink_rename(), try_fwrite() */ #include "rexit.h" /* for exit_err() */ #include "main.h" /* for World, Wins structs */ @@ -158,13 +157,13 @@ extern void save_win_config(struct World * world, char id) } char line[size]; sprintf(line, "%s\n", wc->title); - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); sprintf(line, "%c\n", wc->draw); - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); sprintf(line, "%d\n", wc->height); - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); sprintf(line, "%d\n", wc->width); - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); char * path = string_prefixed_id(world, "config/windows/Win_", id); try_fclose_unlink_rename(file, path_tmp, path, world, f_name); @@ -304,7 +303,7 @@ extern void init_winconfs(struct World * world) winconf_ids[i] = '\0'; exit_err(errno, world, err_r); exit_err(closedir(dp), world, err_c); - world->winconf_ids = try_malloc(strlen(winconf_ids + 1), world, f_name); + world->winconf_ids = try_malloc(strlen(winconf_ids) + 1, world, f_name); memcpy(world->winconf_ids, winconf_ids, strlen(winconf_ids) + 1); free(winconf_ids); @@ -432,7 +431,7 @@ extern void save_win_configs(struct World * world) i++; } line[i] = '\n'; - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); try_fclose_unlink_rename(file, path_tmp, path, world, f_name); }