From owner-p4-projects@FreeBSD.ORG  Thu Jul 31 13:58:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1F74F106567B; Thu, 31 Jul 2008 13:58:15 +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 D6AC81065679
	for <perforce@freebsd.org>; Thu, 31 Jul 2008 13:58:14 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C9C088FC23
	for <perforce@freebsd.org>; Thu, 31 Jul 2008 13:58:14 +0000 (UTC)
	(envelope-from gabor@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 m6VDwEWR089757
	for <perforce@freebsd.org>; Thu, 31 Jul 2008 13:58:14 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6VDwEVh089755
	for perforce@freebsd.org; Thu, 31 Jul 2008 13:58:14 GMT
	(envelope-from gabor@freebsd.org)
Date: Thu, 31 Jul 2008 13:58:14 GMT
Message-Id: <200807311358.m6VDwEVh089755@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 146317 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: Thu, 31 Jul 2008 13:58:15 -0000

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

Change 146317 by gabor@gabor_server on 2008/07/31 13:57:32

	- Little improvement in the code with a sizeof expression
	
	Reported by:	fjoe (mentor)

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/file.c#29 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/file.c#29 (text+ko) ====

@@ -128,7 +128,7 @@
 	if (binbufptr == NULL) {
 		/* Only pre-read to the buffer if we need the binary check. */
 		if (binbehave != BINFILE_TEXT) {
-			for (; (i < (BUFSIZ * sizeof(wint_t))) && !grep_feof(f); i++) {
+			for (; i < sizeof(wbinbuf) && !grep_feof(f); i++) {
 				ch = grep_fgetc(f);
 				binbuf[i] = ch;
 			}
@@ -137,7 +137,7 @@
 
 			/* Convert at most (BUFSIZ * sizeof(wint_t)) characters or
 				(BUFSIZ - 1) bytes to wide character string. */
-			size = mbsnrtowcs(wbinbuf, &src, BUFSIZ * sizeof(wint_t), BUFSIZ - 1, &mbs);
+			size = mbsnrtowcs(wbinbuf, &src, sizeof(wbinbuf), BUFSIZ - 1, &mbs);
 			f->binary = 0;
 			for (; size > 0; size--)
 				if (iswbinary(wbinbuf[size])) {