[PATCH 01/12] making the kernel -Wshadow clean - fix mconf

[Jesper Juhl]

Fix -Wshadow warnings in mconf


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

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

--- linux-2.6.18-rc2-orig/scripts/kconfig/mconf.c	2006-06-18 03:49:35.000000000 +0200
+++ linux-2.6.18-rc2/scripts/kconfig/mconf.c	2006-07-18 23:39:51.000000000 +0200
@@ -258,7 +258,7 @@ search_help[] = N_(
 
 static char buf[4096], *bufptr = buf;
 static char input_buf[4096];
-static char filename[PATH_MAX+1] = ".config";
+static char config_filename[PATH_MAX+1] = ".config";
 static char *args[1024], **argptr = args;
 static int indent;
 static struct termios ios_org;
@@ -983,7 +983,7 @@ static void conf_load(void)
 		cprint(load_config_text);
 		cprint("11");
 		cprint("55");
-		cprint("%s", filename);
+		cprint("%s", config_filename);
 		stat = exec_conf();
 		switch(stat) {
 		case 0:
@@ -1012,7 +1012,7 @@ static void conf_save(void)
 		cprint(save_config_text);
 		cprint("11");
 		cprint("55");
-		cprint("%s", filename);
+		cprint("%s", config_filename);
 		stat = exec_conf();
 		switch(stat) {
 		case 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/