emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some warnings in allbareconfig.

Browse Source
This commit is contained in:
Rob Landley 2006-05-28 01:19:06 +00:00
parent 3f78561d63
commit c44bc986b7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/ls.c
View File

@ -353,6 +353,8 @@ static void dfree(struct dnode **dnp, int nfiles)
} }
free(dnp); /* free the array holding the dnode pointers */ free(dnp); /* free the array holding the dnode pointers */
} }
#else
#define dfree(...)
#endif #endif
static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which) static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)

7
util-linux/more.c
View File

@ -67,9 +67,6 @@ int more_main(int argc, char **argv)
int len, page_height; int len, page_height;
int terminal_width; int terminal_width;
int terminal_height; int terminal_height;
#ifndef CONFIG_FEATURE_USE_TERMIOS
int cin_fileno;
#endif
argc--; argc--;
argv++; argv++;
@ -80,9 +77,9 @@ int more_main(int argc, char **argv)
cin = fopen(CURRENT_TTY, "r"); cin = fopen(CURRENT_TTY, "r");
if (!cin) if (!cin)
cin = bb_xfopen(CONSOLE_DEV, "r"); cin = bb_xfopen(CONSOLE_DEV, "r");
cin_fileno = fileno(cin);
please_display_more_prompt = 2; please_display_more_prompt = 2;
#ifdef CONFIG_FEATURE_USE_TERMIOS #ifdef CONFIG_FEATURE_USE_TERMIOS
cin_fileno = fileno(cin);
getTermSettings(cin_fileno, &initial_settings); getTermSettings(cin_fileno, &initial_settings);
new_settings = initial_settings; new_settings = initial_settings;
new_settings.c_lflag &= ~ICANON; new_settings.c_lflag &= ~ICANON;
@ -112,7 +109,7 @@ int more_main(int argc, char **argv)
please_display_more_prompt &= ~1; please_display_more_prompt &= ~1;
get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height); get_terminal_width_height(fileno(cin), &terminal_width, &terminal_height);
if (terminal_height > 4) if (terminal_height > 4)
terminal_height -= 2; terminal_height -= 2;
if (terminal_width > 0) if (terminal_width > 0)