d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use braces to avoid potentially ambiguous else clause.

Browse Source 
main's return type is int not void.

Reviewed by: obrien and chuckr
This commit is contained in:
Warner Losh 1999-04-25 22:14:06 +00:00
parent fc51d58e62
commit bdca080cce
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/lib/libdialog/menubox.c
View File

@ -259,7 +259,7 @@ draw:
else else
i = choice - 1; i = choice - 1;
} }
else if (KEY_IS_DOWN(key)) else if (KEY_IS_DOWN(key)) {
if (choice == max_choice - 1) { if (choice == max_choice - 1) {
if (scroll + choice < item_no - 1) { if (scroll + choice < item_no - 1) {
/* Scroll menu up */ /* Scroll menu up */
@ -285,6 +285,7 @@ draw:
} }
else else
i = choice + 1; i = choice + 1;
}
if (i != choice) { if (i != choice) {
/* De-highlight current item */ /* De-highlight current item */

6
gnu/lib/libdialog/tree.c
View File

@ -315,7 +315,7 @@ int dialog_treemenu(unsigned char *title, unsigned char *prompt,
else else
i = choice - 1; i = choice - 1;
} }
else if (key == KEY_DOWN || key == '+') else if (key == KEY_DOWN || key == '+') {
if (choice == max_choice - 1) { if (choice == max_choice - 1) {
if (scroll+choice < item_no-1) { if (scroll+choice < item_no-1) {
#ifdef BROKEN_WSCRL #ifdef BROKEN_WSCRL
@ -352,6 +352,7 @@ int dialog_treemenu(unsigned char *title, unsigned char *prompt,
} }
else else
i = choice + 1; i = choice + 1;
}
if (i != choice) { if (i != choice) {
/* De-highlight current item */ /* De-highlight current item */
@ -987,7 +988,7 @@ mk_tree(unsigned char **names, int size, unsigned char FS,
in_string = name = names[i]; in_string = name = names[i];
while(*in_string) while(*in_string)
{ {
if (*in_string == FS) if (*in_string == FS) {
if (!i && !*(in_string + 1)) if (!i && !*(in_string + 1))
name = in_string; name = in_string;
else else
@ -995,6 +996,7 @@ mk_tree(unsigned char **names, int size, unsigned char FS,
shift++; shift++;
name = in_string + 1; name = in_string + 1;
} }
}
in_string++; in_string++;
} }
array[i].name = name; array[i].name = name;

2
gnu/usr.bin/sort/sort.c
View File

@ -1719,7 +1719,7 @@ set_ordering (register const char *s, struct keyfield *key,
return (char *) s; return (char *) s;
} }
void int
main (int argc, char **argv) main (int argc, char **argv)
{ {
struct keyfield *key = NULL, gkey; struct keyfield *key = NULL, gkey;

2
gnu/usr.bin/tar/tar.c
View File

@ -197,7 +197,7 @@ struct option long_options[] =
/* /*
* Main routine for tar. * Main routine for tar.
*/ */
void int
main (argc, argv) main (argc, argv)
int argc; int argc;
char **argv; char **argv;