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

ul: fix shadow declaration

text-utils/ul.c:641:25: warning: declaration of 'col' shadows a global declaration [-Wshadow]
text-utils/ul.c:126:5: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/text-utils/ul.c b/text-utils/ul.c
index 80bc7a12e5..3c7bf50438 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -638,11 +638,11 @@ static void setcol(int newcol) {
 		needcol(col);
 }
 
-static void needcol(int col) {
-	maxcol = col;
+static void needcol(int acol) {
+	maxcol = acol;
 
 	/* If col >= obuflen, expand obuf until obuflen > col. */
-	while (col >= obuflen) {
+	while (acol >= obuflen) {
 		/* Paranoid check for obuflen == INT_MAX. */
 		if (obuflen == INT_MAX)
 			errx(EXIT_FAILURE, _("Input line too long."));