From owner-p4-projects@FreeBSD.ORG  Mon Aug 18 09:07:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B4DB01065681; Mon, 18 Aug 2008 09:07:55 +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 785D61065688
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 09:07:55 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7149C8FC12
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 09:07:55 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7I97tmH099610
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 09:07:55 GMT
	(envelope-from konrad@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7I97tJL099608
	for perforce@freebsd.org; Mon, 18 Aug 2008 09:07:55 GMT
	(envelope-from konrad@FreeBSD.org)
Date: Mon, 18 Aug 2008 09:07:55 GMT
Message-Id: <200808180907.m7I97tJL099608@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	konrad@FreeBSD.org using -f
From: Konrad Jankowski <konrad@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 147700 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: Mon, 18 Aug 2008 09:07:56 -0000

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

Change 147700 by konrad@vspredator on 2008/08/18 09:06:59

	Disable additional conversions, to ease debugging.

Affected files ...

.. //depot/projects/soc2008/konrad_collation/test/sort/sort.c#5 edit

Differences ...

==== //depot/projects/soc2008/konrad_collation/test/sort/sort.c#5 (text+ko) ====

@@ -14,7 +14,7 @@
 } *lines[MAXSIZE];
 
 static int
-read_input(void)
+read_input(int xfrm)
 {
 	char buf[1000];
 	int i = 0, len;
@@ -26,10 +26,12 @@
 			err(1, "malloc");
 		if ((line->sline = strdup(buf)) == NULL)
 			err(1, "strdup");
-		len = strxfrm(NULL, buf, 0);
-		if ((line->trans = malloc(len + 1)) == NULL)
-			err(1, "malloc");
-		strxfrm(line->trans, buf, len);
+		if (xfrm) {
+			len = strxfrm(NULL, buf, 0);
+			if ((line->trans = malloc(len + 1)) == NULL)
+				err(1, "malloc");
+			strxfrm(line->trans, buf, len);
+		}
 		lines[i] = line;
 		i++;
 	}
@@ -91,7 +93,7 @@
 	}
 	if ((p = setlocale(LC_ALL, "")) == NULL)
 		errx(1, "setlocale");
-	num_lines = read_input();
+	num_lines = read_input(xfrm);
 	fprintf(stderr, "setlocale: %s\n", p);
 	if (xfrm)
 		qsort(lines, num_lines, sizeof(struct line *), strcmp_compare);