summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristian Ionescu-Idbohrn <cii@axis.com>2011-05-01 12:43:53 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-05-01 12:43:53 (GMT)
commitfcbc641fe36a2ceff334362cc6ba62b000c842a5 (patch)
tree656ae5a8772a7d284b6fcb3d9272c935af5097b2
parent2cfb57647b072900b5e66977c500c6ee0978dd0e (diff)
downloadbusybox-fcbc641fe36a2ceff334362cc6ba62b000c842a5.tar.gz
busybox-fcbc641fe36a2ceff334362cc6ba62b000c842a5.tar.bz2
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>
-rw-r--r--.gitignore1
-rw-r--r--scripts/kconfig/conf.c11
-rw-r--r--scripts/kconfig/lxdialog/textbox.c8
3 files changed, 6 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 7d2cca6..0a0c65b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ Config.in
# Normal output
#
/busybox
+/busybox_old
/busybox_unstripped*
#
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 6e09788..ea2446a 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -173,7 +173,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
int conf_string(struct menu *menu)
{
struct symbol *sym = menu->sym;
- const char *def, *help;
+ const char *def;
while (1) {
printf("%*s%s ", indent - 1, "", menu->prompt->text);
@@ -188,10 +188,7 @@ int conf_string(struct menu *menu)
case '?':
/* print help */
if (line[1] == '\n') {
- help = nohelp_text;
- if (menu->sym->help)
- help = menu->sym->help;
- printf("\n%s\n", menu->sym->help);
+ printf("\n%s\n", menu->sym->help ? menu->sym->help : nohelp_text);
def = NULL;
break;
}
@@ -207,7 +204,6 @@ int conf_string(struct menu *menu)
static int conf_sym(struct menu *menu)
{
struct symbol *sym = menu->sym;
- int type;
tristate oldval, newval;
const char *help;
@@ -215,7 +211,6 @@ static int conf_sym(struct menu *menu)
printf("%*s%s ", indent - 1, "", menu->prompt->text);
if (sym->name)
printf("(%s) ", sym->name);
- type = sym_get_type(sym);
putchar('[');
oldval = sym_get_tristate_value(sym);
switch (oldval) {
@@ -282,11 +277,9 @@ static int conf_choice(struct menu *menu)
{
struct symbol *sym, *def_sym;
struct menu *child;
- int type;
bool is_new;
sym = menu->sym;
- type = sym_get_type(sym);
is_new = !sym_has_value(sym);
if (sym_is_changable(sym)) {
conf_sym(menu);
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index 77848bb..de4ae41 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -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 passed_end;
- char search_term[MAX_LEN + 1];
WINDOW *dialog, *text;
- search_term[0] = '\0'; /* no search term entered yet */
-
/* Open input file for reading */
if ((fd = open(file, O_RDONLY)) == -1) {
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)
{
- int y, x;
char *line;
line = get_line();
@@ -446,11 +442,13 @@ static void print_line(WINDOW * win, int row, int width)
waddch(win, ' ');
waddnstr(win, line, MIN(strlen(line), width - 2));
- getyx(win, y, x);
/* Clear 'residue' of previous line */
#if OLD_NCURSES
{
int i;
+ int y, x;
+
+ getyx(win, y, x);
for (i = 0; i < width - x; i++)
waddch(win, ' ');
}