[PATCH] Fix invalid variable shadowing
Andreas Schwab
schwab@redhat.com
Fri May 27 09:57:00 GMT 2011
2011-05-27 Andreas Schwab <schwab@redhat.com>
[BZ #12814]
* iconvdata/iso-2022-jp.c (BODY): Fix invalid variable shadowing.
---
iconvdata/iso-2022-jp.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index e14b796..5580c44 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -764,9 +764,9 @@ static const cvlist_t conversion_lists[4] =
++rp; \
if (ch >= rp->start) \
{ \
- unsigned char res = \
+ unsigned char ch2 = \
iso88597_from_ucs4[ch - 0xa0 + rp->idx]; \
- if (res != '\0') \
+ if (ch2 != '\0') \
{ \
if (set2 != ISO88597_set) \
{ \
@@ -789,7 +789,7 @@ static const cvlist_t conversion_lists[4] =
} \
*outptr++ = ESC; \
*outptr++ = 'N'; \
- *outptr++ = res; \
+ *outptr++ = ch2; \
res = __GCONV_OK; \
break; \
} \
--
1.7.4.4
--
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E
"And now for something completely different."
More information about the Libc-hacker
mailing list