X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fwindows.c;h=da830377e4d7d801e3382fe65aa4666177a744be;hb=39ab34a368fbe30dc6639e021da89b1a20243fd6;hp=674e6ad67a00f149dfa06fa20c778ebb3f414697;hpb=cdb90723dd636591bcfa98ebb165cf74a0cdeec7;p=plomrogue diff --git a/src/client/windows.c b/src/client/windows.c index 674e6ad..da83037 100644 --- a/src/client/windows.c +++ b/src/client/windows.c @@ -23,7 +23,7 @@ * draw_win_keybindings_winconf_geometry(), * draw_win_keybindings_global() */ -#include "keybindings.h" /* free_keybindings(), write_keybidings_to_file(), +#include "keybindings.h" /* write_keybidings_to_file(), * read_keybindings_from_file() */ #include "misc.h" /* array_append() */ @@ -180,7 +180,10 @@ static void * get_drawfunc_by_char(char c) || match_func(c, &f, 'm', draw_win_map) || match_func(c, &f, '0', draw_win_keybindings_global) || match_func(c, &f, '1', draw_win_keybindings_winconf_geometry) - || match_func(c, &f, '2', draw_win_keybindings_winconf_keybindings)); + || match_func(c, &f, '2', draw_win_keybindings_winconf_keybindings)) + { + ; + } return f; } @@ -240,7 +243,7 @@ static void refit_v_screen() /* Only resize .v_screen if the rightmost window column has changed. */ char * err_s = "refit_v_screen() grows virtual screen beyond legal sizes."; char * err_m = "refit_v_screen() triggers memory alloc error in wresize()."; - if (getmaxx(world.winDB.v_screen) + 1 != lastwcol) + if ((uint32_t) getmaxx(world.winDB.v_screen) + 1 != lastwcol) { uint8_t t = (lastwcol + 2 > UINT16_MAX); exit_err(t, err_s); @@ -739,7 +742,8 @@ extern void free_winDB() { struct Win * wc = get_win_by_id(id); free(wc->title); - free_keybindings(wc->kb.kbs); + free(wc->kb.kbs); + wc->kb.kbs = NULL; } free(world.winDB.ids); /* NULL this too since add_win_to_winDB() checks */ world.winDB.ids = NULL; /* for it to detect its first post-DB-purge round.*/ @@ -749,7 +753,7 @@ extern void free_winDB() -extern void winch_called(int signal) +extern void winch_called() { world.winch = 1; }