From owner-svn-src-user@FreeBSD.ORG  Sun Jul 24 18:16:15 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 06D2E106566B;
	Sun, 24 Jul 2011 18:16:15 +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 EB1E68FC16;
	Sun, 24 Jul 2011 18:16:14 +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 p6OIGEc4019181;
	Sun, 24 Jul 2011 18:16:14 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6OIGE8a019179;
	Sun, 24 Jul 2011 18:16:14 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201107241816.p6OIGE8a019179@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 24 Jul 2011 18:16:14 +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: r224293 - 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: Sun, 24 Jul 2011 18:16:15 -0000

Author: gabor
Date: Sun Jul 24 18:16:14 2011
New Revision: 224293
URL: http://svn.freebsd.org/changeset/base/224293

Log:
  - Actually fix shifting

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	Sun Jul 24 18:03:02 2011	(r224292)
+++ user/gabor/tre-integration/contrib/tre/lib/fastmatch.c	Sun Jul 24 18:16:14 2011	(r224293)
@@ -375,15 +375,15 @@ tre_fastexec(const fastmatch_t *fg, cons
 	switch (type)
 	  {
 	    case STR_BYTE:
-	      wc = btowc(((char *)startptr)[mismatch]);
+	      wc = btowc(((char *)startptr)[mismatch + 1]);
 	      r = hashtable_get(fg->qsBc, &wc, &k);
 	      break;
 	    case STR_MBS:
-	      tre_mbrtowc(&wc, &((char *)startptr)[mismatch], MB_CUR_MAX, NULL);
+	      tre_mbrtowc(&wc, &((char *)startptr)[mismatch + 1], MB_CUR_MAX, NULL);
 	      r = hashtable_get(fg->qsBc, &wc, &k);
 	      break;
 	    case STR_WIDE:
-	      r = hashtable_get(fg->qsBc, &((char *)startptr)[mismatch], &k);
+	      r = hashtable_get(fg->qsBc, &((char *)startptr)[mismatch + 1], &k);
 	      break;
 	    default:
 	      /* XXX */