From owner-p4-projects@FreeBSD.ORG  Fri Aug  7 00:28:48 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 482581065674; Fri,  7 Aug 2009 00:28:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06803106566B
	for <perforce@freebsd.org>; Fri,  7 Aug 2009 00:28:48 +0000 (UTC)
	(envelope-from delphij@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EB0FF8FC43
	for <perforce@freebsd.org>; Fri,  7 Aug 2009 00:28:47 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n770SldC023836
	for <perforce@freebsd.org>; Fri, 7 Aug 2009 00:28:47 GMT
	(envelope-from delphij@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n770SlGd023834
	for perforce@freebsd.org; Fri, 7 Aug 2009 00:28:47 GMT
	(envelope-from delphij@freebsd.org)
Date: Fri, 7 Aug 2009 00:28:47 GMT
Message-Id: <200908070028.n770SlGd023834@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	delphij@freebsd.org using -f
From: Xin LI <delphij@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167079 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Aug 2009 00:28:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=167079

Change 167079 by delphij@charlie on 2009/08/07 00:27:50

	iconv(3) would mangle the pointer every time, so reset them at the beginning
	of loop.

Affected files ...

.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/gen-rev.c#2 edit

Differences ...

==== //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/gen-rev.c#2 (text+ko) ====

@@ -64,17 +64,19 @@
 	iconv_t		 cd;
 	uint8_t		 outbuf[4];
 	uint32_t	 inbuf;
-	size_t		 inbytes = 4, outbytesleft, ret;
-	char		*outbuf_ = (char *)outbuf;
-	const char	*inbuf_ = (const char *)inbuf;
+	size_t		 inbytesleft, outbytesleft, ret;
+	char		*outbuf_;
+	const char	*inbuf_;
 
 	if ((cd = iconv_open(argv[1], "UCS-4-INTERNAL")) == (iconv_t)-1)
 		err(1, NULL);
 
 	for (inbuf = 0;; inbuf += 1) {
-		outbytesleft = 4;
+		inbytesleft = outbytesleft = 4;
+		outbuf_ = (char*) outbuf;
+		inbuf_ = (const char *)&inbuf;
 		iconv(cd,NULL,NULL,NULL,NULL);
-		ret = iconv(cd, &inbuf_, &inbytes, &outbuf_, &outbytesleft);
+		ret = iconv(cd, &inbuf_, &inbytesleft, &outbuf_, &outbytesleft);
 		if (ret == (size_t)-1) {
 			switch(errno) {
 			case EILSEQ:
@@ -83,9 +85,9 @@
 				continue;
 			}
 		}
-		format(inbuf_, 4);
+		format((const char*)&inbuf, 4);
 		printf(" = ");
-		format(outbuf_, outbytesleft);
+		format((const char*)outbuf, 4 - outbytesleft);
 		printf("\n");
 	}