From owner-svn-src-user@FreeBSD.ORG  Wed Aug 10 21:39:47 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9D6801065672;
	Wed, 10 Aug 2011 21:39:47 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73C958FC17;
	Wed, 10 Aug 2011 21:39:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7ALdl6h062460;
	Wed, 10 Aug 2011 21:39:47 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7ALdlNv062458;
	Wed, 10 Aug 2011 21:39:47 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201108102139.p7ALdlNv062458@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 10 Aug 2011 21:39:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224767 - user/gabor/tre-integration/contrib/tre/lib
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Aug 2011 21:39:47 -0000

Author: gabor
Date: Wed Aug 10 21:39:47 2011
New Revision: 224767
URL: http://svn.freebsd.org/changeset/base/224767

Log:
  - Fix a wchar-cleanness issue
  - TRE-specific style

Modified:
  user/gabor/tre-integration/contrib/tre/lib/fastmatch.c

Modified: user/gabor/tre-integration/contrib/tre/lib/fastmatch.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/fastmatch.c	Wed Aug 10 21:32:13 2011	(r224766)
+++ user/gabor/tre-integration/contrib/tre/lib/fastmatch.c	Wed Aug 10 21:39:47 2011	(r224767)
@@ -475,38 +475,46 @@ tre_fastexec(const fastmatch_t *fg, cons
 	shift = fg->len;
     }
 
-  /* XXX: make wchar-clean */
   /* Only try once at the beginning or ending of the line. */
-  if (fg->bol || fg->eol) {
-    /* Simple text comparison. */
-    if (!((fg->bol && fg->eol) && (len != fg->len))) {
-      /* Determine where in data to start search at. */
-      j = fg->eol ? len - fg->len : 0;
-      SKIP_CHARS(j);
-      COMPARE;
-      if (mismatch == REG_OK) {
-	pmatch[0].rm_so = j;
-	pmatch[0].rm_eo = j + fg->len;
-	return REG_OK;
-      }
+  if (fg->bol || fg->eol)
+    {
+      /* Simple text comparison. */
+      if (!((fg->bol && fg->eol) &&
+	  (type == STR_WIDE ? (wlen != fg->wlen) : (len != fg->len))))
+	{
+	  /* Determine where in data to start search at. */
+	  j = fg->eol ? len - (type == STR_WIDE ? fg->wlen : fg->len) : 0;
+	  SKIP_CHARS(j);
+	  COMPARE;
+	  if (mismatch == REG_OK)
+	    {
+	      pmatch[0].rm_so = j;
+	      pmatch[0].rm_eo = j + (type == STR_WIDE ? fg->wlen : fg->len);
+	      return REG_OK;
+            }
+        }
     }
-  } else {
-    /* Quick Search algorithm. */
-    j = 0;
-    do {
-      SKIP_CHARS(j);
-      COMPARE;
-      if (mismatch == REG_OK) {
-	pmatch[0].rm_so = j;
-	pmatch[0].rm_eo = j + ((type == STR_WIDE) ? fg->wlen : fg->len);
-	return REG_OK;
-      } else if (mismatch > 0)
-        return mismatch;
-      mismatch = -mismatch - 1;
-      SHIFT;
-    } while (!IS_OUT_OF_BOUNDS);
-  }
-  return ret;
+  else
+    {
+      /* Quick Search algorithm. */
+      j = 0;
+      do
+	{
+	  SKIP_CHARS(j);
+	  COMPARE;
+	  if (mismatch == REG_OK)
+	    {
+	      pmatch[0].rm_so = j;
+	      pmatch[0].rm_eo = j + ((type == STR_WIDE) ? fg->wlen : fg->len);
+	      return REG_OK;
+	    }
+	  else if (mismatch > 0)
+	    return mismatch;
+	  mismatch = -mismatch - 1;
+	  SHIFT;
+        } while (!IS_OUT_OF_BOUNDS);
+    }
+    return ret;
 }
 
 void