From owner-p4-projects@FreeBSD.ORG  Mon Nov 30 21:18:54 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C3F4106568F; Mon, 30 Nov 2009 21:18:54 +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 11082106568B
	for <perforce@freebsd.org>; Mon, 30 Nov 2009 21:18:54 +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 002388FC1D
	for <perforce@freebsd.org>; Mon, 30 Nov 2009 21:18:53 +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 nAULIrYJ019332
	for <perforce@freebsd.org>; Mon, 30 Nov 2009 21:18:53 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAULIrqU019330
	for perforce@freebsd.org; Mon, 30 Nov 2009 21:18:53 GMT
	(envelope-from gabor@freebsd.org)
Date: Mon, 30 Nov 2009 21:18:53 GMT
Message-Id: <200911302118.nAULIrqU019330@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 171209 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 30 Nov 2009 21:18:54 -0000

http://p4web.freebsd.org/chv.cgi?CH=171209

Change 171209 by gabor@gabor_server on 2009/11/30 21:18:28

	- Change order of if's and for's so that conditions are only
	  checked once

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#92 edit

Differences ...

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

@@ -609,11 +609,12 @@
  * XXX: fgrepcomp() and fastcomp() are workarounds for regexec() performance.
  * Optimizations should be done there.
  */
-	for (i = 0; i < patterns; ++i) {
 		/* Check if cheating is allowed (always is for fgrep). */
-		if (grepbehave == GREP_FIXED)
+	if (grepbehave == GREP_FIXED) {
+		for (i = 0; i < patterns; ++i)
 			fgrepcomp(&fg_pattern[i], pattern[i]);
-		else {
+	} else {
+		for (i = 0; i < patterns; ++i) {
 			if (fastcomp(&fg_pattern[i], pattern[i])) {
 				/* Fall back to full regex library */
 				c = regcomp(&r_pattern[i], pattern[i], cflags);