From owner-svn-src-user@FreeBSD.ORG  Tue Oct 11 14:03:18 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 E59B8106564A;
	Tue, 11 Oct 2011 14:03:18 +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 D64388FC0A;
	Tue, 11 Oct 2011 14:03:18 +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 p9BE3I35018530;
	Tue, 11 Oct 2011 14:03:18 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9BE3IuC018528;
	Tue, 11 Oct 2011 14:03:18 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201110111403.p9BE3IuC018528@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 11 Oct 2011 14:03:18 +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: r226258 - user/gabor/grep/trunk/regex
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, 11 Oct 2011 14:03:19 -0000

Author: gabor
Date: Tue Oct 11 14:03:18 2011
New Revision: 226258
URL: http://svn.freebsd.org/changeset/base/226258

Log:
  - Fix shift values on all architectures
  
  Submitted by:	delphij

Modified:
  user/gabor/grep/trunk/regex/tre-fastmatch.c

Modified: user/gabor/grep/trunk/regex/tre-fastmatch.c
==============================================================================
--- user/gabor/grep/trunk/regex/tre-fastmatch.c	Tue Oct 11 13:56:37 2011	(r226257)
+++ user/gabor/grep/trunk/regex/tre-fastmatch.c	Tue Oct 11 14:03:18 2011	(r226258)
@@ -161,7 +161,7 @@ static int	fastcmp(const fastmatch_t *fg
       shift = bc;							\
     else								\
       {									\
-	ts = ((long)u - v < 0) ? 0 : (u - v);				\
+	ts = (u >= v) ? (u - v) : 0;					\
 	shift = MAX(ts, bc);						\
 	shift = MAX(shift, gs);						\
 	if (shift == gs)						\