[RFC][PATCH 2/9] -Wshadow: Fix warnings in mconf

[Jesper Juhl]

(please see the mail titled 
 "[RFC][PATCH 0/9] -Wshadow: Making the kernel build clean with -Wshadow"
 for an explanation of why I'm doing this)


Fix the following -Wshadow warnings in mconf : 

  scripts/kconfig/mconf.c:279: warning: declaration of 'filename' shadows a global declaration
  scripts/kconfig/mconf.c:261: warning: shadowed declaration is here
  scripts/kconfig/mconf.c:867: warning: declaration of 'filename' shadows a global declaration
  scripts/kconfig/mconf.c:261: warning: shadowed declaration is here

This makes  make all[no|mod|yes]config -Wshadow clean.


Signed-off-by: Jesper Juhl <jesper.juhl@xxxxxxxxx>
---

 scripts/kconfig/mconf.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- linux-2.6.18-rc1-orig/scripts/kconfig/mconf.c	2006-06-18 03:49:35.000000000 +0200
+++ linux-2.6.18-rc1/scripts/kconfig/mconf.c	2006-07-09 19:48:05.000000000 +0200
@@ -276,7 +276,7 @@ static void conf_save(void);
 static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
-static void show_file(const char *filename, const char *title, int r, int c);
+static void show_file(const char *fname, const char *title, int r, int c);
 
 static void cprint_init(void);
 static int cprint1(const char *fmt, ...);
@@ -864,7 +864,7 @@ static void show_help(struct menu *menu)
 	str_free(&help);
 }
 
-static void show_file(const char *filename, const char *title, int r, int c)
+static void show_file(const char *fname, const char *title, int r, int c)
 {
 	do {
 		cprint_init();
@@ -873,7 +873,7 @@ static void show_file(const char *filena
 			cprint("%s", title);
 		}
 		cprint("--textbox");
-		cprint("%s", filename);
+		cprint("%s", fname);
 		cprint("%d", r ? r : rows);
 		cprint("%d", c ? c : cols);
 	} while (exec_conf() < 0);



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/