BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get rid of several "variable 'x' set but not used" warnings 

Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
1_19_stable
Cristian Ionescu-Idbohrn 2011-05-01 14:43:53 +02:00 committed by Denys Vlasenko
parent 2cfb57647b
commit fcbc641fe3
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -18,6 +18,7 @@ Config.in
# Normal output # Normal output
# #
/busybox /busybox
/busybox_old
/busybox_unstripped* /busybox_unstripped*
# #

11
scripts/kconfig/conf.c
View File

@ -173,7 +173,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
int conf_string(struct menu *menu) int conf_string(struct menu *menu)
{ {
struct symbol *sym = menu->sym; struct symbol *sym = menu->sym;
const char *def, *help; const char *def;
while (1) { while (1) {
printf("%*s%s ", indent - 1, "", menu->prompt->text); printf("%*s%s ", indent - 1, "", menu->prompt->text);
@ -188,10 +188,7 @@ int conf_string(struct menu *menu)
case '?': case '?':
/* print help */ /* print help */
if (line[1] == '\n') { if (line[1] == '\n') {
help = nohelp_text; printf("\n%s\n", menu->sym->help ? menu->sym->help : nohelp_text);
if (menu->sym->help)
help = menu->sym->help;
printf("\n%s\n", menu->sym->help);
def = NULL; def = NULL;
break; break;
} }
@ -207,7 +204,6 @@ int conf_string(struct menu *menu)
static int conf_sym(struct menu *menu) static int conf_sym(struct menu *menu)
{ {
struct symbol *sym = menu->sym; struct symbol *sym = menu->sym;
int type;
tristate oldval, newval; tristate oldval, newval;
const char *help; const char *help;
@ -215,7 +211,6 @@ static int conf_sym(struct menu *menu)
printf("%*s%s ", indent - 1, "", menu->prompt->text); printf("%*s%s ", indent - 1, "", menu->prompt->text);
if (sym->name) if (sym->name)
printf("(%s) ", sym->name); printf("(%s) ", sym->name);
type = sym_get_type(sym);
putchar('['); putchar('[');
oldval = sym_get_tristate_value(sym); oldval = sym_get_tristate_value(sym);
switch (oldval) { switch (oldval) {
@ -282,11 +277,9 @@ static int conf_choice(struct menu *menu)
{ {
struct symbol *sym, *def_sym; struct symbol *sym, *def_sym;
struct menu *child; struct menu *child;
int type;
bool is_new; bool is_new;
sym = menu->sym; sym = menu->sym;
type = sym_get_type(sym);
is_new = !sym_has_value(sym); is_new = !sym_has_value(sym);
if (sym_is_changable(sym)) { if (sym_is_changable(sym)) {
conf_sym(menu); conf_sym(menu);

8
scripts/kconfig/lxdialog/textbox.c
View File

@ -38,11 +38,8 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
{ {
int i, x, y, cur_x, cur_y, fpos, key = 0; int i, x, y, cur_x, cur_y, fpos, key = 0;
int passed_end; int passed_end;
char search_term[MAX_LEN + 1];
WINDOW *dialog, *text; WINDOW *dialog, *text;
search_term[0] = '\0'; /* no search term entered yet */
/* Open input file for reading */ /* Open input file for reading */
if ((fd = open(file, O_RDONLY)) == -1) { if ((fd = open(file, O_RDONLY)) == -1) {
endwin(); endwin();
@ -437,7 +434,6 @@ static void print_page(WINDOW * win, int height, int width)
*/ */
static void print_line(WINDOW * win, int row, int width) static void print_line(WINDOW * win, int row, int width)
{ {
int y, x;
char *line; char *line;
line = get_line(); line = get_line();
@ -446,11 +442,13 @@ static void print_line(WINDOW * win, int row, int width)
waddch(win, ' '); waddch(win, ' ');
waddnstr(win, line, MIN(strlen(line), width - 2)); waddnstr(win, line, MIN(strlen(line), width - 2));
getyx(win, y, x);
/* Clear 'residue' of previous line */ /* Clear 'residue' of previous line */
#if OLD_NCURSES #if OLD_NCURSES
{ {
int i; int i;
int y, x;
getyx(win, y, x);
for (i = 0; i < width - x; i++) for (i = 0; i < width - x; i++)
waddch(win, ' '); waddch(win, ' ');
} }