From owner-svn-src-user@FreeBSD.ORG  Tue Jul 26 01:06:44 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 64E6A106564A;
	Tue, 26 Jul 2011 01:06:44 +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 54B288FC0A;
	Tue, 26 Jul 2011 01:06:44 +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 p6Q16il6084645;
	Tue, 26 Jul 2011 01:06:44 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6Q16itP084643;
	Tue, 26 Jul 2011 01:06:44 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201107260106.p6Q16itP084643@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 26 Jul 2011 01:06:44 +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: r224412 - 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: Tue, 26 Jul 2011 01:06:44 -0000

Author: gabor
Date: Tue Jul 26 01:06:44 2011
New Revision: 224412
URL: http://svn.freebsd.org/changeset/base/224412

Log:
  - Defer converting to MBS pattern until it is sure that the compilation
    will succeed.

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	Mon Jul 25 23:01:08 2011	(r224411)
+++ user/gabor/tre-integration/contrib/tre/lib/fastmatch.c	Tue Jul 26 01:06:44 2011	(r224412)
@@ -261,9 +261,6 @@ tre_fastcomp(fastmatch_t *fg, const tre_
     return REG_ESPACE;
   memcpy(fg->wpattern, wpat, fg->wlen * sizeof(tre_char_t));
   fg->wpattern[fg->wlen] = TRE_CHAR('\0');
-#ifdef TRE_WCHAR
-  STORE_MBS_PAT;
-#endif
 
   /* Look for ways to cheat...er...avoid the full regex engine. */
   for (unsigned int i = 0; i < fg->wlen; i++) {
@@ -287,16 +284,16 @@ tre_fastcomp(fastmatch_t *fg, const tre_
       }
     } else {
 	/* Free memory and let others know this is empty. */
-#ifdef TRE_WCHAR
-	free(fg->pattern);
-	fg->pattern = NULL;
-#endif
 	free(fg->wpattern);
 	fg->wpattern = NULL;
 	return REG_BADPAT;
     }
   }
 
+#ifdef TRE_WCHAR
+  STORE_MBS_PAT;
+#endif
+
   /*
    * Determine if a reverse search would be faster based on the placement
    * of the dots.