From owner-svn-src-stable-9@FreeBSD.ORG Mon May 20 03:03:24 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DAA68947; Mon, 20 May 2013 03:03:24 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BD4DE7CD; Mon, 20 May 2013 03:03:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4K33On2070356; Mon, 20 May 2013 03:03:24 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4K33OJi070350; Mon, 20 May 2013 03:03:24 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201305200303.r4K33OJi070350@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Mon, 20 May 2013 03:03:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250822 - stable/9/gnu/usr.bin/grep X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 May 2013 03:03:24 -0000 Author: pfg Date: Mon May 20 03:03:23 2013 New Revision: 250822 URL: http://svnweb.freebsd.org/changeset/base/250822 Log: Revert r250821 - This was not meant to be a direct commit. (wrong tree) Pointy hat: me Modified: stable/9/gnu/usr.bin/grep/dfa.c stable/9/gnu/usr.bin/grep/grep.c stable/9/gnu/usr.bin/grep/search.c Modified: stable/9/gnu/usr.bin/grep/dfa.c ============================================================================== --- stable/9/gnu/usr.bin/grep/dfa.c Mon May 20 02:34:45 2013 (r250821) +++ stable/9/gnu/usr.bin/grep/dfa.c Mon May 20 03:03:23 2013 (r250822) @@ -334,10 +334,9 @@ static int hard_LC_COLLATE; /* Nonzero i #ifdef MBS_SUPPORT /* These variables are used only if (MB_CUR_MAX > 1). */ static mbstate_t mbs; /* Mbstate for mbrlen(). */ -static ssize_t cur_mb_len; /* Byte length of the current scanning - multibyte character. Must also handle - negative result from mbrlen(). */ -static ssize_t cur_mb_index; /* Byte index of the current scanning multibyte +static int cur_mb_len; /* Byte length of the current scanning + multibyte character. */ +static int cur_mb_index; /* Byte index of the current scanning multibyte character. singlebyte character : cur_mb_index = 0 @@ -370,7 +369,7 @@ static unsigned char const *buf_end; /* /* This function update cur_mb_len, and cur_mb_index. p points current lexptr, len is the remaining buffer length. */ static void -update_mb_len_index (unsigned char const *p, size_t len) +update_mb_len_index (unsigned char const *p, int len) { /* If last character is a part of a multibyte character, we update cur_mb_index. */ @@ -2464,7 +2463,7 @@ match_mb_charset (struct dfa *d, int s, int match; /* Flag which represent that matching succeed. */ int match_len; /* Length of the character (or collating element) with which this operator match. */ - size_t op_len; /* Length of the operator. */ + int op_len; /* Length of the operator. */ char buffer[128]; wchar_t wcbuf[6]; Modified: stable/9/gnu/usr.bin/grep/grep.c ============================================================================== --- stable/9/gnu/usr.bin/grep/grep.c Mon May 20 02:34:45 2013 (r250821) +++ stable/9/gnu/usr.bin/grep/grep.c Mon May 20 03:03:23 2013 (r250822) @@ -1346,9 +1346,9 @@ int main (int argc, char **argv) { char *keys; - size_t cc, keycc, oldcc, keyalloc; + size_t keycc, oldcc, keyalloc; int with_filenames; - int opt, status; + int opt, cc, status; int default_context; FILE *fp; extern char *optarg; Modified: stable/9/gnu/usr.bin/grep/search.c ============================================================================== --- stable/9/gnu/usr.bin/grep/search.c Mon May 20 02:34:45 2013 (r250821) +++ stable/9/gnu/usr.bin/grep/search.c Mon May 20 03:03:23 2013 (r250822) @@ -112,7 +112,7 @@ static void kwsinit (void) { static char trans[NCHAR]; - size_t i; + int i; if (match_icase) for (i = 0; i < NCHAR; ++i) @@ -326,8 +326,7 @@ EGexecute (char const *buf, size_t size, { register char const *buflim, *beg, *end; char eol = eolbyte; - int backref; - ptrdiff_t start, len; + int backref, start, len; struct kwsmatch kwsm; size_t i, ret_val; static int use_dfa;