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

more: fix shadow declaration

text-utils/more.c:1123:13: warning: declaration of 'state' shadows a previous local [-Wshadow]
text-utils/more.c:1095:18: warning: shadowed declaration is here [-Wshadow]

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

diff --git a/text-utils/more.c b/text-utils/more.c
index 4cf090fd6e..5e41a540ab 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1120,10 +1120,10 @@ void prbuf (register char *s, register int n)
 	    {
 		wchar_t wc;
 		size_t mblength;
-		mbstate_t state;
-		memset (&state, '\0', sizeof (mbstate_t));
+		mbstate_t mbstate;
+		memset (&mbstate, '\0', sizeof (mbstate_t));
 		s--; n++;
-		mblength = mbrtowc (&wc, s, n, &state);
+		mblength = mbrtowc (&wc, s, n, &mbstate);
 		if (mblength == (size_t) -2 || mblength == (size_t) -1)
 			mblength = 1;
 		while (mblength--)