From 35d2979599d0ad7a7aaf62f3d59fc099119b76d3 Mon Sep 17 00:00:00 2001 From: imp Date: Sun, 25 Apr 1999 22:14:06 +0000 Subject: Use braces to avoid potentially ambiguous else clause. main's return type is int not void. Reviewed by: obrien and chuckr --- gnu/lib/libdialog/menubox.c | 3 ++- gnu/lib/libdialog/tree.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/lib/libdialog') diff --git a/gnu/lib/libdialog/menubox.c b/gnu/lib/libdialog/menubox.c index 73d004a..9a5b0c2 100644 --- a/gnu/lib/libdialog/menubox.c +++ b/gnu/lib/libdialog/menubox.c @@ -259,7 +259,7 @@ draw: else i = choice - 1; } - else if (KEY_IS_DOWN(key)) + else if (KEY_IS_DOWN(key)) { if (choice == max_choice - 1) { if (scroll + choice < item_no - 1) { /* Scroll menu up */ @@ -285,6 +285,7 @@ draw: } else i = choice + 1; + } if (i != choice) { /* De-highlight current item */ diff --git a/gnu/lib/libdialog/tree.c b/gnu/lib/libdialog/tree.c index e48f134..43c7399 100644 --- a/gnu/lib/libdialog/tree.c +++ b/gnu/lib/libdialog/tree.c @@ -315,7 +315,7 @@ int dialog_treemenu(unsigned char *title, unsigned char *prompt, else i = choice - 1; } - else if (key == KEY_DOWN || key == '+') + else if (key == KEY_DOWN || key == '+') { if (choice == max_choice - 1) { if (scroll+choice < item_no-1) { #ifdef BROKEN_WSCRL @@ -352,6 +352,7 @@ int dialog_treemenu(unsigned char *title, unsigned char *prompt, } else i = choice + 1; + } if (i != choice) { /* De-highlight current item */ @@ -987,7 +988,7 @@ mk_tree(unsigned char **names, int size, unsigned char FS, in_string = name = names[i]; while(*in_string) { - if (*in_string == FS) + if (*in_string == FS) { if (!i && !*(in_string + 1)) name = in_string; else @@ -995,6 +996,7 @@ mk_tree(unsigned char **names, int size, unsigned char FS, shift++; name = in_string + 1; } + } in_string++; } array[i].name = name; -- cgit v1.1