]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
more: fix shadow declaration
authorSami Kerola <kerolasa@iki.fi>
Wed, 25 Jul 2012 19:15:31 +0000 (21:15 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 26 Jul 2012 11:51:18 +0000 (13:51 +0200)
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>
text-utils/more.c

index 4cf090fd6eb6421e6da3c02d6015bcdbc9229a83..5e41a540abad13b78a45e0258bede9f2662d99a1 100644 (file)
@@ -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--)