diff options
| author | Michael Vetter <jubalh@openmailbox.org> | 2015-10-09 11:20:49 +0200 |
|---|---|---|
| committer | Michael Vetter <jubalh@openmailbox.org> | 2015-10-12 09:29:01 +0200 |
| commit | dd2ce7a5bfe6b854f8a54137c6bbcf536de1ddd7 (patch) | |
| tree | fa2fc048520b9578bf23b1cbdac66bc7c0a018b0 /src | |
| parent | 8dfa41ea8e05262225c83e38ccba1ea83f10e4b8 (diff) | |
| download | profani-tty-dd2ce7a5bfe6b854f8a54137c6bbcf536de1ddd7.tar.gz | |
Reduce scope of variables in ui/core
Not as important as the other one (where there was a double declaration). But for the sake of consistency.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/core.c | 14 | ||||
| -rw-r--r-- | src/ui/window.c | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index ff6d90ce..13ae6cab 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -2582,12 +2582,9 @@ ui_handle_room_configuration_form_error(const char * const roomjid, const char * void ui_handle_room_config_submit_result(const char * const roomjid) { - ProfWin *muc_window = NULL; - ProfWin *form_window = NULL; - int num; - if (roomjid) { - muc_window = (ProfWin*)wins_get_muc(roomjid); + ProfWin *form_window = NULL; + ProfWin *muc_window = (ProfWin*)wins_get_muc(roomjid); GString *form_recipient = g_string_new(roomjid); g_string_append(form_recipient, " config"); @@ -2595,7 +2592,7 @@ ui_handle_room_config_submit_result(const char * const roomjid) g_string_free(form_recipient, TRUE); if (form_window) { - num = wins_get_num(form_window); + int num = wins_get_num(form_window); wins_close_by_num(num); } @@ -2616,10 +2613,9 @@ void ui_handle_room_config_submit_result_error(const char * const roomjid, const char * const message) { ProfWin *console = wins_get_console(); - ProfWin *muc_window = NULL; - ProfWin *form_window = NULL; - if (roomjid) { + ProfWin *muc_window = NULL; + ProfWin *form_window = NULL; muc_window = (ProfWin*)wins_get_muc(roomjid); GString *form_recipient = g_string_new(roomjid); diff --git a/src/ui/window.c b/src/ui/window.c index 8579b02f..261b9380 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -471,12 +471,12 @@ win_clear(ProfWin *window) void win_resize(ProfWin *window) { - int subwin_cols = 0; int cols = getmaxx(stdscr); if (window->layout->type == LAYOUT_SPLIT) { ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout; if (layout->subwin) { + int subwin_cols = 0; if (window->type == WIN_CONSOLE) { subwin_cols = win_roster_cols(); } else if (window->type == WIN_MUC) { @@ -506,11 +506,11 @@ win_update_virtual(ProfWin *window) { int rows, cols; getmaxyx(stdscr, rows, cols); - int subwin_cols = 0; if (window->layout->type == LAYOUT_SPLIT) { ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout; if (layout->subwin) { + int subwin_cols = 0; if (window->type == WIN_MUC) { subwin_cols = win_occpuants_cols(); } else { |