From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 25 Jul 2012 19:15:30 +0000 (+0200)
Subject: setterm: fix shadow declaration
X-Git-Tag: v2.22-rc1~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d9e37bfedde94627dec0274851c344560551c3f;p=thirdparty%2Futil-linux.git

setterm: fix shadow declaration

term-utils/setterm.c:221:55: warning: declaration of 'opt_term' shadows a global declaration [-Wshadow]
term-utils/setterm.c:181:5: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 3083ac8268..a2cf93b1e6 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -218,11 +218,11 @@ static void screendump(int vcnum, FILE *F);
  */
 
 static void
-parse_term(int argc, char **argv, int *option, char **opt_term, int *bad_arg) {
+parse_term(int argc, char **argv, int *option, char **ttyname, int *bad_arg) {
 	/* argc: Number of arguments for this option. */
 	/* argv: Arguments for this option. */
 	/* option: Term flag to set. */
-	/* opt_term: Terminal name to set. */
+	/* ttyname: Terminal name to set. */
 	/* bad_arg: Set to true if an error is detected. */
 
 /* Parse a -term specification. */
@@ -231,7 +231,7 @@ parse_term(int argc, char **argv, int *option, char **opt_term, int *bad_arg) {
 		*bad_arg = TRUE;
 	*option = TRUE;
 	if (argc == 1)
-		*opt_term = argv[0];
+		*ttyname = argv[0];
 }
 
 static void