From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6666 invoked by alias); 27 May 2011 10:31:39 -0000 Received: (qmail 6645 invoked by uid 22791); 27 May 2011 10:31:38 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_CV,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 May 2011 10:31:10 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4RAVASH016208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 27 May 2011 06:31:10 -0400 Received: from hase (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4RAV8Fx030535 for ; Fri, 27 May 2011 06:31:09 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Fix conversion to ISO-2022-JP-2 with ISO-8859-7 designation References: X-Yow: I used to be a FUNDAMENTALIST, but then I heard about the HIGH RADIATION LEVELS and bought an ENCYCLOPEDIA!! Date: Fri, 27 May 2011 10:31:00 -0000 In-Reply-To: (Andreas Schwab's message of "Fri, 27 May 2011 11:57:02 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00011.txt.bz2 2011-05-27 Andreas Schwab [BZ #12814] * iconvdata/iso-2022-jp.c (BODY for TO_LOOP): Fix invalid variable shadowing. Strip upper bit when using 8859-7 designation. --- iconvdata/iso-2022-jp.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c index e14b796..05ddb28 100644 --- a/iconvdata/iso-2022-jp.c +++ b/iconvdata/iso-2022-jp.c @@ -664,7 +664,7 @@ static const cvlist_t conversion_lists[4] = \ *outptr++ = ESC; \ *outptr++ = 'N'; \ - *outptr++ = res; \ + *outptr++ = res & 0x7f; \ written = 3; \ } \ } \ @@ -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 - 0x80; \ 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."