From MAILER-DAEMON Wed Sep 07 17:41:52 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R1PsV-0000ST-W9
	for mharc-grep-commit@gnu.org; Wed, 07 Sep 2011 17:41:51 -0400
Received: from eggs.gnu.org ([140.186.70.92]:37155)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R1PsT-0000Rm-94
	for grep-commit@gnu.org; Wed, 07 Sep 2011 17:41:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R1PsR-0006vN-RD
	for grep-commit@gnu.org; Wed, 07 Sep 2011 17:41:49 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47152)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R1PsR-0006vI-Lt
	for grep-commit@gnu.org; Wed, 07 Sep 2011 17:41:47 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1R1PsQ-00077f-Sc
	for grep-commit@gnu.org; Wed, 07 Sep 2011 21:41:47 +0000
Date: Wed, 07 Sep 2011 21:41:46 +0000
Message-Id: <E1R1PsQ-00077f-Sc@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-21-g72ad859
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a7e745b9d40e3c94cc5527a257c37f334fa0c9d0
X-Git-Newrev: 72ad859d857dd8162078305dc4f8543650141998
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Sep 2011 21:41:50 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  72ad859d857dd8162078305dc4f8543650141998 (commit)
      from  a7e745b9d40e3c94cc5527a257c37f334fa0c9d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=72ad859d857dd8162078305dc4f8543650141998


commit 72ad859d857dd8162078305dc4f8543650141998
Author: Jim Meyering <meyering@redhat.com>
Date:   Wed Sep 7 23:41:22 2011 +0200

    doc: use "file name" consistently in grep's --help output
    
    * src/main.c (usage): Use "file name", not "filename" in descriptions
    of --with-filename (-H), --no-filename (-h) and --label=LABEL.
    Suggested by Sequoia McDowell.
    
    bug: requires ru_RU.KOI8-R".  [bug introduced in grep-2.9]

diff --git a/src/main.c b/src/main.c
index 2cdf82f..c70156f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1442,9 +1442,9 @@ Output control:\n\
   -b, --byte-offset         print the byte offset with output lines\n\
   -n, --line-number         print line number with output lines\n\
       --line-buffered       flush output on every line\n\
-  -H, --with-filename       print the filename for each match\n\
-  -h, --no-filename         suppress the prefixing filename on output\n\
-      --label=LABEL         print LABEL as filename for standard input\n\
+  -H, --with-filename       print the file name for each match\n\
+  -h, --no-filename         suppress the file name prefix on output\n\
+      --label=LABEL         use LABEL as the standard input file name prefix\n\
 "));
       printf (_("\
   -o, --only-matching       show only the part of a line matching PATTERN\n\

-----------------------------------------------------------------------

Summary of changes:
 src/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Sep 15 06:11:12 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R48uW-0001x5-2k
	for mharc-grep-commit@gnu.org; Thu, 15 Sep 2011 06:11:12 -0400
Received: from eggs.gnu.org ([140.186.70.92]:55839)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R48uT-0001ww-C4
	for grep-commit@gnu.org; Thu, 15 Sep 2011 06:11:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R48uR-00086i-WB
	for grep-commit@gnu.org; Thu, 15 Sep 2011 06:11:09 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:35150)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R48uR-00086c-Qs
	for grep-commit@gnu.org; Thu, 15 Sep 2011 06:11:07 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1R48uR-00076T-2e
	for grep-commit@gnu.org; Thu, 15 Sep 2011 10:11:07 +0000
Date: Thu, 15 Sep 2011 10:11:07 +0000
Message-Id: <E1R48uR-00076T-2e@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-25-g875ead8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 72ad859d857dd8162078305dc4f8543650141998
X-Git-Newrev: 875ead86cca8f52129cef813ccc0f4c730dc0620
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Sep 2011 10:11:10 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  875ead86cca8f52129cef813ccc0f4c730dc0620 (commit)
       via  e0ddc20aede7255a9f287cac6f31ab55d4fb72d9 (commit)
       via  7ab88c048031be827726dc2e46611cd5c55ecbd0 (commit)
       via  2e00c51e30c210e850e24a19de0a050e9795f712 (commit)
      from  72ad859d857dd8162078305dc4f8543650141998 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=875ead86cca8f52129cef813ccc0f4c730dc0620


commit 875ead86cca8f52129cef813ccc0f4c730dc0620
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon Apr 5 11:37:06 2010 +0200

    maint: dfa: improve comments
    
    * src/dfa.c (match_mb_charset, match_anychar): Improve comments.

diff --git a/src/dfa.c b/src/dfa.c
index a0d644f..5b5ed93 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2863,11 +2863,9 @@ transit_state_singlebyte (struct dfa *d, int s, unsigned char const *p,
   return rval;
 }
 
-/* Check whether period can match or not in the current context.  If it can,
-   return the amount of the bytes with which period can match, otherwise
-   return 0.
-   `pos' is the position of the period.  `idx' is the index from the
-   buf_begin, and it is the current position in the buffer.  */
+/* Match a "." against the current context.  buf_begin[IDX] is the
+   current position.  Return the length of the match, in bytes.
+   POS is the position of the ".".  */
 static int
 match_anychar (struct dfa *d, int s, position pos, int idx)
 {
@@ -2903,11 +2901,10 @@ match_anychar (struct dfa *d, int s, position pos, int idx)
   return mbclen;
 }
 
-/* Check whether bracket expression can match or not in the current context.
-   If it can, return the amount of the bytes with which expression can match,
-   otherwise return 0.
-   `pos' is the position of the bracket expression.  `idx' is the index
-   from the buf_begin, and it is the current position in the buffer.  */
+/* Match a bracket expression against the current context.
+   buf_begin[IDX] is the current position.
+   Return the length of the match, in bytes.
+   POS is the position of the bracket expression.  */
 static int
 match_mb_charset (struct dfa *d, int s, position pos, int idx)
 {

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=e0ddc20aede7255a9f287cac6f31ab55d4fb72d9


commit 875ead86cca8f52129cef813ccc0f4c730dc0620
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon Apr 5 11:37:06 2010 +0200

    maint: dfa: improve comments
    
    * src/dfa.c (match_mb_charset, match_anychar): Improve comments.

diff --git a/src/dfa.c b/src/dfa.c
index a0d644f..5b5ed93 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2863,11 +2863,9 @@ transit_state_singlebyte (struct dfa *d, int s, unsigned char const *p,
   return rval;
 }
 
-/* Check whether period can match or not in the current context.  If it can,
-   return the amount of the bytes with which period can match, otherwise
-   return 0.
-   `pos' is the position of the period.  `idx' is the index from the
-   buf_begin, and it is the current position in the buffer.  */
+/* Match a "." against the current context.  buf_begin[IDX] is the
+   current position.  Return the length of the match, in bytes.
+   POS is the position of the ".".  */
 static int
 match_anychar (struct dfa *d, int s, position pos, int idx)
 {
@@ -2903,11 +2901,10 @@ match_anychar (struct dfa *d, int s, position pos, int idx)
   return mbclen;
 }
 
-/* Check whether bracket expression can match or not in the current context.
-   If it can, return the amount of the bytes with which expression can match,
-   otherwise return 0.
-   `pos' is the position of the bracket expression.  `idx' is the index
-   from the buf_begin, and it is the current position in the buffer.  */
+/* Match a bracket expression against the current context.
+   buf_begin[IDX] is the current position.
+   Return the length of the match, in bytes.
+   POS is the position of the bracket expression.  */
 static int
 match_mb_charset (struct dfa *d, int s, position pos, int idx)
 {

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=7ab88c048031be827726dc2e46611cd5c55ecbd0


commit 875ead86cca8f52129cef813ccc0f4c730dc0620
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon Apr 5 11:37:06 2010 +0200

    maint: dfa: improve comments
    
    * src/dfa.c (match_mb_charset, match_anychar): Improve comments.

diff --git a/src/dfa.c b/src/dfa.c
index a0d644f..5b5ed93 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2863,11 +2863,9 @@ transit_state_singlebyte (struct dfa *d, int s, unsigned char const *p,
   return rval;
 }
 
-/* Check whether period can match or not in the current context.  If it can,
-   return the amount of the bytes with which period can match, otherwise
-   return 0.
-   `pos' is the position of the period.  `idx' is the index from the
-   buf_begin, and it is the current position in the buffer.  */
+/* Match a "." against the current context.  buf_begin[IDX] is the
+   current position.  Return the length of the match, in bytes.
+   POS is the position of the ".".  */
 static int
 match_anychar (struct dfa *d, int s, position pos, int idx)
 {
@@ -2903,11 +2901,10 @@ match_anychar (struct dfa *d, int s, position pos, int idx)
   return mbclen;
 }
 
-/* Check whether bracket expression can match or not in the current context.
-   If it can, return the amount of the bytes with which expression can match,
-   otherwise return 0.
-   `pos' is the position of the bracket expression.  `idx' is the index
-   from the buf_begin, and it is the current position in the buffer.  */
+/* Match a bracket expression against the current context.
+   buf_begin[IDX] is the current position.
+   Return the length of the match, in bytes.
+   POS is the position of the bracket expression.  */
 static int
 match_mb_charset (struct dfa *d, int s, position pos, int idx)
 {

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=2e00c51e30c210e850e24a19de0a050e9795f712


commit 875ead86cca8f52129cef813ccc0f4c730dc0620
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon Apr 5 11:37:06 2010 +0200

    maint: dfa: improve comments
    
    * src/dfa.c (match_mb_charset, match_anychar): Improve comments.

diff --git a/src/dfa.c b/src/dfa.c
index a0d644f..5b5ed93 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2863,11 +2863,9 @@ transit_state_singlebyte (struct dfa *d, int s, unsigned char const *p,
   return rval;
 }
 
-/* Check whether period can match or not in the current context.  If it can,
-   return the amount of the bytes with which period can match, otherwise
-   return 0.
-   `pos' is the position of the period.  `idx' is the index from the
-   buf_begin, and it is the current position in the buffer.  */
+/* Match a "." against the current context.  buf_begin[IDX] is the
+   current position.  Return the length of the match, in bytes.
+   POS is the position of the ".".  */
 static int
 match_anychar (struct dfa *d, int s, position pos, int idx)
 {
@@ -2903,11 +2901,10 @@ match_anychar (struct dfa *d, int s, position pos, int idx)
   return mbclen;
 }
 
-/* Check whether bracket expression can match or not in the current context.
-   If it can, return the amount of the bytes with which expression can match,
-   otherwise return 0.
-   `pos' is the position of the bracket expression.  `idx' is the index
-   from the buf_begin, and it is the current position in the buffer.  */
+/* Match a bracket expression against the current context.
+   buf_begin[IDX] is the current position.
+   Return the length of the match, in bytes.
+   POS is the position of the bracket expression.  */
 static int
 match_mb_charset (struct dfa *d, int s, position pos, int idx)
 {

-----------------------------------------------------------------------

Summary of changes:
 gnulib    |    2 +-
 src/dfa.c |   35 +++++++++++++++++------------------
 2 files changed, 18 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Sep 15 08:08:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R4Ajd-0000PB-Cs
	for mharc-grep-commit@gnu.org; Thu, 15 Sep 2011 08:08:05 -0400
Received: from eggs.gnu.org ([140.186.70.92]:58780)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4AjX-0000Oh-B7
	for grep-commit@gnu.org; Thu, 15 Sep 2011 08:08:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4AjV-0003ZI-FG
	for grep-commit@gnu.org; Thu, 15 Sep 2011 08:07:59 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:36452)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4AjV-0003ZD-Bd
	for grep-commit@gnu.org; Thu, 15 Sep 2011 08:07:57 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1R4AjU-0005Sq-Kh
	for grep-commit@gnu.org; Thu, 15 Sep 2011 12:07:57 +0000
Date: Thu, 15 Sep 2011 12:07:56 +0000
Message-Id: <E1R4AjU-0005Sq-Kh@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-27-g46e5cc6
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 875ead86cca8f52129cef813ccc0f4c730dc0620
X-Git-Newrev: 46e5cc6fb27886af532e6f34c4491bd533637f7c
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Sep 2011 12:08:03 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  46e5cc6fb27886af532e6f34c4491bd533637f7c (commit)
       via  86ff96a57b2e9aa66096839cc39e1404a3f954af (commit)
      from  875ead86cca8f52129cef813ccc0f4c730dc0620 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=46e5cc6fb27886af532e6f34c4491bd533637f7c


commit 46e5cc6fb27886af532e6f34c4491bd533637f7c
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon May 2 12:22:34 2011 +0200

    tests: skip tests that require MBS support
    
    * tests/init.cfg (require_compiled_in_MB_support): New function.
    * tests/char-class-multibyte: Use it here, since this test cannot
    succeed without MBS support.
    * tests/equiv-classes: Likewise.
    * tests/euc-mb: Likewise.
    * tests/fgrep-infloop: Likewise.
    * tests/init.cfg: Likewise.
    * tests/prefix-of-multibyte: Likewise.
    * tests/turkish-I: Likewise.
    * tests/sjis-mb: Likewise.

diff --git a/tests/char-class-multibyte b/tests/char-class-multibyte
index 07d9620..88b8fa0 100755
--- a/tests/char-class-multibyte
+++ b/tests/char-class-multibyte
@@ -3,6 +3,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 require_en_utf8_locale_
+require_compiled_in_MB_support
 
 printf 'é\n'      > exp1 || framework_failure_
 fail=0
diff --git a/tests/equiv-classes b/tests/equiv-classes
index de38d95..940efa4 100755
--- a/tests/equiv-classes
+++ b/tests/equiv-classes
@@ -4,6 +4,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 require_en_utf8_locale_
+require_compiled_in_MB_support
 
 LC_ALL=en_US.UTF-8
 export LC_ALL
diff --git a/tests/euc-mb b/tests/euc-mb
index e6154f3..ee5ee61 100755
--- a/tests/euc-mb
+++ b/tests/euc-mb
@@ -7,6 +7,8 @@
 # Add "." to PATH for the use of get-mb-cur-max.
 path_prepend_ .
 
+require_compiled_in_MB_support
+
 locale=ja_JP.EUC-JP
 
 make_input () {
diff --git a/tests/fgrep-infloop b/tests/fgrep-infloop
index 908b788..7ef8297 100755
--- a/tests/fgrep-infloop
+++ b/tests/fgrep-infloop
@@ -4,6 +4,7 @@
 
 require_en_utf8_locale_
 require_timeout_
+require_compiled_in_MB_support
 
 encode() { echo "$1" | tr ABC '\357\274\241'; }
 
diff --git a/tests/init.cfg b/tests/init.cfg
index f6ead9c..25e87f3 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -78,3 +78,10 @@ require_ru_RU_koi8_r()
     *) skip_test_ 'ru_RU.KOI8-R locale not found' ;;
   esac
 }
+
+require_compiled_in_MB_support()
+{
+  require_en_utf8_locale_
+  printf 'é' | LC_ALL=en_US.UTF-8 grep '[[:lower:]]' \
+    || skip_ this test requires MBS support
+}
diff --git a/tests/prefix-of-multibyte b/tests/prefix-of-multibyte
index 05045b0..851e1f6 100755
--- a/tests/prefix-of-multibyte
+++ b/tests/prefix-of-multibyte
@@ -3,6 +3,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 require_en_utf8_locale_
+require_compiled_in_MB_support
 
 encode() { echo "$1" | tr ABC '\357\274\241'; }
 
diff --git a/tests/sjis-mb b/tests/sjis-mb
index 07c9a9a..b5a18dc 100755
--- a/tests/sjis-mb
+++ b/tests/sjis-mb
@@ -8,6 +8,7 @@
 # Add "." to PATH for the use of get-mb-cur-max.
 path_prepend_ .
 
+require_compiled_in_MB_support
 require_timeout_
 
 locale=ja_JP.SHIFT_JIS
diff --git a/tests/turkish-I b/tests/turkish-I
index ac536c4..d941ed1 100755
--- a/tests/turkish-I
+++ b/tests/turkish-I
@@ -19,6 +19,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 require_en_utf8_locale_
+require_compiled_in_MB_support
 
 fail=0
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=86ff96a57b2e9aa66096839cc39e1404a3f954af


commit 46e5cc6fb27886af532e6f34c4491bd533637f7c
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon May 2 12:22:34 2011 +0200

    tests: skip tests that require MBS support
    
    * tests/init.cfg (require_compiled_in_MB_support): New function.
    * tests/char-class-multibyte: Use it here, since this test cannot
    succeed without MBS support.
    * tests/equiv-classes: Likewise.
    * tests/euc-mb: Likewise.
    * tests/fgrep-infloop: Likewise.
    * tests/init.cfg: Likewise.
    * tests/prefix-of-multibyte: Likewise.
    * tests/turkish-I: Likewise.
    * tests/sjis-mb: Likewise.

diff --git a/tests/char-class-multibyte b/tests/char-class-multibyte
index 07d9620..88b8fa0 100755
--- a/tests/char-class-multibyte
+++ b/tests/char-class-multibyte
@@ -3,6 +3,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 require_en_utf8_locale_
+require_compiled_in_MB_support
 
 printf 'é\n'      > exp1 || framework_failure_
 fail=0
diff --git a/tests/equiv-classes b/tests/equiv-classes
index de38d95..940efa4 100755
--- a/tests/equiv-classes
+++ b/tests/equiv-classes
@@ -4,6 +4,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 require_en_utf8_locale_
+require_compiled_in_MB_support
 
 LC_ALL=en_US.UTF-8
 export LC_ALL
diff --git a/tests/euc-mb b/tests/euc-mb
index e6154f3..ee5ee61 100755
--- a/tests/euc-mb
+++ b/tests/euc-mb
@@ -7,6 +7,8 @@
 # Add "." to PATH for the use of get-mb-cur-max.
 path_prepend_ .
 
+require_compiled_in_MB_support
+
 locale=ja_JP.EUC-JP
 
 make_input () {
diff --git a/tests/fgrep-infloop b/tests/fgrep-infloop
index 908b788..7ef8297 100755
--- a/tests/fgrep-infloop
+++ b/tests/fgrep-infloop
@@ -4,6 +4,7 @@
 
 require_en_utf8_locale_
 require_timeout_
+require_compiled_in_MB_support
 
 encode() { echo "$1" | tr ABC '\357\274\241'; }
 
diff --git a/tests/init.cfg b/tests/init.cfg
index f6ead9c..25e87f3 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -78,3 +78,10 @@ require_ru_RU_koi8_r()
     *) skip_test_ 'ru_RU.KOI8-R locale not found' ;;
   esac
 }
+
+require_compiled_in_MB_support()
+{
+  require_en_utf8_locale_
+  printf 'é' | LC_ALL=en_US.UTF-8 grep '[[:lower:]]' \
+    || skip_ this test requires MBS support
+}
diff --git a/tests/prefix-of-multibyte b/tests/prefix-of-multibyte
index 05045b0..851e1f6 100755
--- a/tests/prefix-of-multibyte
+++ b/tests/prefix-of-multibyte
@@ -3,6 +3,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 require_en_utf8_locale_
+require_compiled_in_MB_support
 
 encode() { echo "$1" | tr ABC '\357\274\241'; }
 
diff --git a/tests/sjis-mb b/tests/sjis-mb
index 07c9a9a..b5a18dc 100755
--- a/tests/sjis-mb
+++ b/tests/sjis-mb
@@ -8,6 +8,7 @@
 # Add "." to PATH for the use of get-mb-cur-max.
 path_prepend_ .
 
+require_compiled_in_MB_support
 require_timeout_
 
 locale=ja_JP.SHIFT_JIS
diff --git a/tests/turkish-I b/tests/turkish-I
index ac536c4..d941ed1 100755
--- a/tests/turkish-I
+++ b/tests/turkish-I
@@ -19,6 +19,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 require_en_utf8_locale_
+require_compiled_in_MB_support
 
 fail=0
 

-----------------------------------------------------------------------

Summary of changes:
 tests/char-class-multibyte |    1 +
 tests/equiv-classes        |    1 +
 tests/euc-mb               |    2 ++
 tests/fgrep-infloop        |    1 +
 tests/fmbtest              |    4 ++--
 tests/init.cfg             |    7 +++++++
 tests/prefix-of-multibyte  |    1 +
 tests/sjis-mb              |    1 +
 tests/turkish-I            |    1 +
 9 files changed, 17 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Sep 15 08:25:52 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R4B0p-0006uE-W3
	for mharc-grep-commit@gnu.org; Thu, 15 Sep 2011 08:25:51 -0400
Received: from eggs.gnu.org ([140.186.70.92]:51455)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4B0k-0006u1-Lf
	for grep-commit@gnu.org; Thu, 15 Sep 2011 08:25:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4B0j-0007ab-4q
	for grep-commit@gnu.org; Thu, 15 Sep 2011 08:25:46 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50571)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4B0j-0007aO-3H
	for grep-commit@gnu.org; Thu, 15 Sep 2011 08:25:45 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1R4B0i-0006Mh-LW
	for grep-commit@gnu.org; Thu, 15 Sep 2011 12:25:44 +0000
Date: Thu, 15 Sep 2011 12:25:44 +0000
Message-Id: <E1R4B0i-0006Mh-LW@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-28-gadb4b2c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 46e5cc6fb27886af532e6f34c4491bd533637f7c
X-Git-Newrev: adb4b2ca3aef27eb8991f8cb022a85964f4ad49e
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Sep 2011 12:25:51 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  adb4b2ca3aef27eb8991f8cb022a85964f4ad49e (commit)
      from  46e5cc6fb27886af532e6f34c4491bd533637f7c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=adb4b2ca3aef27eb8991f8cb022a85964f4ad49e


commit adb4b2ca3aef27eb8991f8cb022a85964f4ad49e
Author: Jim Meyering <meyering@redhat.com>
Date:   Sat Sep 10 15:14:21 2011 +0200

    tests: stop using skip_test_; use skip_ instead
    
    * tests/init.cfg (skip_test_): Remove definition.  Use the improved
    skip_ function from init.sh, now that it has the same feature.
    * tests/euc-mb: s/skip_test_/skip_/
    * tests/sjis-mb: Likewise.
    * tests/fmbtest: Likewise.

diff --git a/tests/euc-mb b/tests/euc-mb
index ee5ee61..c0af220 100755
--- a/tests/euc-mb
+++ b/tests/euc-mb
@@ -22,7 +22,7 @@ euc_grep () {
 
 case $(get-mb-cur-max $locale) in
   2|3) ;;
-  *) skip_test_ 'EUC-JP locale not found' ;;
+  *) skip_ 'EUC-JP locale not found' ;;
 esac
 
 fail=0
diff --git a/tests/fmbtest b/tests/fmbtest
index 4e4ee89..38ab73b 100755
--- a/tests/fmbtest
+++ b/tests/fmbtest
@@ -11,7 +11,7 @@ cz=cs_CZ.UTF-8
 
 # If cs_CZ.UTF-8 locale doesn't work, skip this test.
 LC_ALL=$cz locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
-  || skip_test_ this system lacks the $cz locale
+  || skip_ this system lacks the $cz locale
 
 # If matching is done in single-byte mode, skip this test too
 printf 'é\n' | LC_ALL=$cz grep -Eq '^[é]{2}$'
diff --git a/tests/init.cfg b/tests/init.cfg
index 25e87f3..27b68df 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -1,19 +1,9 @@
 # This file is sourced by init.sh, *before* its initialization.
 
-# This goes hand in hand with the "exec 9>&2;" in tests/Makefile.am's
+# This goes hand in hand with the "9>&2;" in tests/Makefile.am's
 # TESTS_ENVIRONMENT definition.
 stderr_fileno_=9
 
-# Use this function rather than init.sh's skip_.
-# The "skip_" function emits its diagnostic only to one stream.
-# This one emits it both to the tty and to the log file.
-skip_test_()
-{
-  echo "$0: skipping test: $@" | head -1 1>&9
-  echo "$0: skipping test: $@" 1>&2
-  Exit 77
-}
-
 # Map settings of "none" to the empty string.
 test _"$LOCALE_FR" = _none && LOCALE_FR=
 test _"$LOCALE_FR_UTF8" = _none && LOCALE_FR_UTF8=
@@ -50,12 +40,12 @@ test "$envvar_check_fail" = 1 && fail_ "failed to unset the above envvars"
 require_timeout_()
 {
   ( timeout 10s true ) > /dev/null 2>&1 \
-    || skip_test_ your system lacks the timeout program
+    || skip_ your system lacks the timeout program
 }
 
 require_pcre_()
 {
-  echo . | grep -P . 2>err || skip_test_ no PCRE support
+  echo . | grep -P . 2>err || skip_ no PCRE support
   compare err /dev/null || fail_ PCRE available, but stderr not empty.
 }
 
@@ -66,7 +56,7 @@ require_en_utf8_locale_()
   path_prepend_ .
   case $(get-mb-cur-max en_US.UTF-8) in
     [3456]) ;;
-    *) skip_test_ 'en_US.UTF-8 locale not found' ;;
+    *) skip_ 'en_US.UTF-8 locale not found' ;;
   esac
 }
 
@@ -75,7 +65,7 @@ require_ru_RU_koi8_r()
   path_prepend_ .
   case $(get-mb-cur-max ru_RU.KOI8-R) in
     1) ;;
-    *) skip_test_ 'ru_RU.KOI8-R locale not found' ;;
+    *) skip_ 'ru_RU.KOI8-R locale not found' ;;
   esac
 }
 
diff --git a/tests/sjis-mb b/tests/sjis-mb
index b5a18dc..b1ec853 100755
--- a/tests/sjis-mb
+++ b/tests/sjis-mb
@@ -40,7 +40,7 @@ test_grep() {
   test $? = 0 && compare out$k exp$k
 }
 
-test "$(get-mb-cur-max $locale)" = 2 || skip_test_ 'SJIS locale not found'
+test "$(get-mb-cur-max $locale)" = 2 || skip_ 'SJIS locale not found'
 
 failure_tests=@A
 successful_tests='%%AA @AA @A@@A'

-----------------------------------------------------------------------

Summary of changes:
 tests/euc-mb   |    2 +-
 tests/fmbtest  |    2 +-
 tests/init.cfg |   20 +++++---------------
 tests/sjis-mb  |    2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Sep 15 10:50:22 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R4DGg-0004Tf-P5
	for mharc-grep-commit@gnu.org; Thu, 15 Sep 2011 10:50:22 -0400
Received: from eggs.gnu.org ([140.186.70.92]:51736)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4DGZ-0004St-Vr
	for grep-commit@gnu.org; Thu, 15 Sep 2011 10:50:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4DGY-0001Qp-V0
	for grep-commit@gnu.org; Thu, 15 Sep 2011 10:50:15 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50459)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4DGY-0001Qb-Qu
	for grep-commit@gnu.org; Thu, 15 Sep 2011 10:50:14 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1R4DGY-0006Xw-02
	for grep-commit@gnu.org; Thu, 15 Sep 2011 14:50:14 +0000
Date: Thu, 15 Sep 2011 14:50:14 +0000
Message-Id: <E1R4DGY-0006Xw-02@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-29-ge41f61a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: adb4b2ca3aef27eb8991f8cb022a85964f4ad49e
X-Git-Newrev: e41f61a2fa00469f8462a9216a9aae5838f26629
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Sep 2011 14:50:20 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  e41f61a2fa00469f8462a9216a9aae5838f26629 (commit)
      from  adb4b2ca3aef27eb8991f8cb022a85964f4ad49e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=e41f61a2fa00469f8462a9216a9aae5838f26629


commit e41f61a2fa00469f8462a9216a9aae5838f26629
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 16:47:48 2011 +0200

    build: avoid compilation failure when building without PCRE support
    
    * src/pcresearch.c [!HAVE_LIBPCRE] (WITHOUT_PCRE_NORETURN): Define
    to _Noreturn, not obsoleted-by-gnulib _GL_ATTRIBUTE_NORETURN.
    Reported by Eric Blake.

diff --git a/src/pcresearch.c b/src/pcresearch.c
index f8581e0..5ccc626 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -103,7 +103,7 @@ Pcompile (char const *pattern, size_t size)
 
 /* Pexecute is a no-return function when building --without-pcre.  */
 #if !HAVE_LIBPCRE
-# define WITHOUT_PCRE_NORETURN _GL_ATTRIBUTE_NORETURN
+# define WITHOUT_PCRE_NORETURN _Noreturn
 #else
 # define WITHOUT_PCRE_NORETURN /* empty */
 #endif

-----------------------------------------------------------------------

Summary of changes:
 src/pcresearch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Fri Sep 16 06:57:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R4W6R-0000iS-Ii
	for mharc-grep-commit@gnu.org; Fri, 16 Sep 2011 06:57:03 -0400
Received: from eggs.gnu.org ([140.186.70.92]:50526)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4W6M-0000iI-Qh
	for grep-commit@gnu.org; Fri, 16 Sep 2011 06:57:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4W6J-0001jI-8w
	for grep-commit@gnu.org; Fri, 16 Sep 2011 06:56:58 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53771)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4W6J-0001jB-3j
	for grep-commit@gnu.org; Fri, 16 Sep 2011 06:56:55 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1R4W6I-0001oi-Cr
	for grep-commit@gnu.org; Fri, 16 Sep 2011 10:56:55 +0000
Date: Fri, 16 Sep 2011 10:56:54 +0000
Message-Id: <E1R4W6I-0001oi-Cr@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-54-gaeef122
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e41f61a2fa00469f8462a9216a9aae5838f26629
X-Git-Newrev: aeef1229af5f6ad00d466daa32a6af53c3bf0729
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Sep 2011 10:57:02 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  aeef1229af5f6ad00d466daa32a6af53c3bf0729 (commit)
       via  2ed5eb19533a372a85f8acd0024ece62922c572e (commit)
       via  0e5c7a931c68720f57f685501f18f50bcb0912a8 (commit)
       via  4a6766f27f65d1f492ca9f4e7667c0e12160bf0a (commit)
       via  45b9473d474b2e6fe7503bfae8ef7f314f7a75cc (commit)
       via  b65489f8019cdcb4256124835057c25747648874 (commit)
       via  ef535d59e12c694b0ceee9cbac7e3c7e82397dab (commit)
       via  2447a70406a218c92796bf838f61462fa5e32b15 (commit)
       via  3751ba1edb20599358473a0e07575b91aef4f338 (commit)
       via  33cc67e4fa32056e4b480ee0e221b0e501688f7e (commit)
       via  dd8b2045018dd9b3fcbdb273231e4f517a4a520a (commit)
       via  82e4f27a17f1dbb37a3d8ba205a59f7cf507826d (commit)
       via  1b83de344966d835056e0c8881b06ab83b1c7ab0 (commit)
       via  7fa273df53d53a0627e18dfe12b701baf658d94e (commit)
       via  ed096a6722d11d6c4a04b48934d86f41f6147ed5 (commit)
       via  2f3b76ae68b0e6951871d4ec9eaa7aafa7c3b12c (commit)
       via  ec31c9c847a13f090d6a5be8ea03ecc8864e2b47 (commit)
       via  93bb1e9e0c5e99ac422a58da483240c47d37bd70 (commit)
       via  ebf1ca7ee208c789184099391adcce76471041f1 (commit)
       via  1fb468215e69babcd55f784c5d3b11305f4078de (commit)
       via  e953c21785007e949474cde75f33f5eec912629c (commit)
       via  78986faf0d25346468d5d8ff8cc34e6825da816e (commit)
       via  18d4e01097b1b2373da7e927f24b194430a279f5 (commit)
       via  083f630d91bf37545678f55aa1c8d337820cb574 (commit)
       via  14c46883a3fe820bfff816b677a28d403e9f36e7 (commit)
      from  e41f61a2fa00469f8462a9216a9aae5838f26629 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=aeef1229af5f6ad00d466daa32a6af53c3bf0729


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=2ed5eb19533a372a85f8acd0024ece62922c572e


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=0e5c7a931c68720f57f685501f18f50bcb0912a8


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=4a6766f27f65d1f492ca9f4e7667c0e12160bf0a


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=45b9473d474b2e6fe7503bfae8ef7f314f7a75cc


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=b65489f8019cdcb4256124835057c25747648874


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ef535d59e12c694b0ceee9cbac7e3c7e82397dab


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=2447a70406a218c92796bf838f61462fa5e32b15


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3751ba1edb20599358473a0e07575b91aef4f338


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=33cc67e4fa32056e4b480ee0e221b0e501688f7e


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=dd8b2045018dd9b3fcbdb273231e4f517a4a520a


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=82e4f27a17f1dbb37a3d8ba205a59f7cf507826d


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=1b83de344966d835056e0c8881b06ab83b1c7ab0


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=7fa273df53d53a0627e18dfe12b701baf658d94e


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ed096a6722d11d6c4a04b48934d86f41f6147ed5


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=2f3b76ae68b0e6951871d4ec9eaa7aafa7c3b12c


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ec31c9c847a13f090d6a5be8ea03ecc8864e2b47


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=93bb1e9e0c5e99ac422a58da483240c47d37bd70


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ebf1ca7ee208c789184099391adcce76471041f1


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=1fb468215e69babcd55f784c5d3b11305f4078de


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=e953c21785007e949474cde75f33f5eec912629c


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=78986faf0d25346468d5d8ff8cc34e6825da816e


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=18d4e01097b1b2373da7e927f24b194430a279f5


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=083f630d91bf37545678f55aa1c8d337820cb574


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=14c46883a3fe820bfff816b677a28d403e9f36e7


commit aeef1229af5f6ad00d466daa32a6af53c3bf0729
Author: Jim Meyering <meyering@redhat.com>
Date:   Thu Sep 15 14:39:44 2011 +0200

    maint: dfa: simplify dfaoptimize
    
    * src/dfa.c (dfaoptimize): Simplify.
    (dfacomp): Remove now-redundant "if (MBS_SUPPORT)" guard,
    since dfaoptimize does nothing if !MBS_SUPPORT.

diff --git a/src/dfa.c b/src/dfa.c
index 6424b6f..e99202b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3420,30 +3420,27 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
-  if (MBS_SUPPORT)
-    {
-      unsigned int i;
-      if (!using_utf8())
-        return;
+  if (!MBS_SUPPORT || !using_utf8())
+    return;
 
-      for (i = 0; i < d->tindex; ++i)
+  unsigned int i;
+  for (i = 0; i < d->tindex; ++i)
+    {
+      switch(d->tokens[i])
         {
-          switch(d->tokens[i])
-            {
-            case ANYCHAR:
-              /* Lowered.  */
-              abort ();
-            case MBCSET:
-              /* Requires multi-byte algorithm.  */
-              return;
-            default:
-              break;
-            }
+        case ANYCHAR:
+          /* Lowered.  */
+          abort ();
+        case MBCSET:
+          /* Requires multi-byte algorithm.  */
+          return;
+        default:
+          break;
         }
-
-      free_mbdata (d);
-      d->mb_cur_max = 1;
     }
+
+  free_mbdata (d);
+  d->mb_cur_max = 1;
 }
 
 /* Parse and analyze a single string of the given length. */
@@ -3453,8 +3450,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-  if (MBS_SUPPORT)
-    dfaoptimize(d);
+  dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }
 

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c         |  214 +++++++++++++++++++----------------------------------
 src/dfasearch.c   |   23 ++----
 src/kwsearch.c    |   29 +++----
 src/search.h      |    2 -
 src/searchutils.c |    6 +-
 5 files changed, 97 insertions(+), 177 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Fri Sep 16 08:29:55 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R4XYJ-0001rR-50
	for mharc-grep-commit@gnu.org; Fri, 16 Sep 2011 08:29:55 -0400
Received: from eggs.gnu.org ([140.186.70.92]:50742)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4XYG-0001qy-T3
	for grep-commit@gnu.org; Fri, 16 Sep 2011 08:29:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4XYF-0008GY-P8
	for grep-commit@gnu.org; Fri, 16 Sep 2011 08:29:52 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58396)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4XYF-0008GJ-NY
	for grep-commit@gnu.org; Fri, 16 Sep 2011 08:29:51 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1R4XYE-00049u-Jo
	for grep-commit@gnu.org; Fri, 16 Sep 2011 12:29:50 +0000
Date: Fri, 16 Sep 2011 12:29:50 +0000
Message-Id: <E1R4XYE-00049u-Jo@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-55-g93927af
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: aeef1229af5f6ad00d466daa32a6af53c3bf0729
X-Git-Newrev: 93927af364aa09dc23a50ca8e4c9a62af0132c59
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Sep 2011 12:29:54 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  93927af364aa09dc23a50ca8e4c9a62af0132c59 (commit)
      from  aeef1229af5f6ad00d466daa32a6af53c3bf0729 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=93927af364aa09dc23a50ca8e4c9a62af0132c59


commit 93927af364aa09dc23a50ca8e4c9a62af0132c59
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon May 2 15:06:52 2011 +0200

    build: fix compilation failure when MBS_SUPPORT is 0
    
    * src/dfa.c (add_utf8_anychar): Always compile this function,
    but when MBS_SUPPORT is 0, give it an empty body.
    (prepare_wc_buf): Likewise.
    [! MBS_SUPPORT] (setbit_wc): Define to always abort.

diff --git a/src/dfa.c b/src/dfa.c
index e99202b..8303022 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -579,7 +579,8 @@ setbit_c (int b, charclass c)
   setbit (b, c);
 }
 #else
-#define setbit_c setbit
+# define setbit_c setbit
+static inline bool setbit_wc (wint_t wc, charclass c) { abort (); }
 #endif
 
 /* Like setbit_c, but if case is folded, set both cases of a letter.  For
@@ -1524,10 +1525,10 @@ addtok_wc (wint_t wc)
 static void addtok_wc (wint_t wc) {}
 #endif
 
-#if MBS_SUPPORT
 static void
 add_utf8_anychar (void)
 {
+#if MBS_SUPPORT
   static const charclass utf8_classes[5] = {
       {  0,  0,  0,  0, ~0, ~0, 0, 0 },            /* 80-bf: non-lead bytes */
       { ~0, ~0, ~0, ~0, 0, 0, 0, 0 },              /* 00-7f: 1-byte sequence */
@@ -1572,8 +1573,8 @@ add_utf8_anychar (void)
       addtok (CAT);
       addtok (OR);
     }
-}
 #endif
+}
 
 /* The grammar understood by the parser is as follows.
 
@@ -3141,13 +3142,13 @@ transit_state (struct dfa *d, int s, unsigned char const **pp)
   return s1;
 }
 
-#if MBS_SUPPORT
 
 /* Initialize mblen_buf and inputwcs with data from the next line.  */
 
 static void
 prepare_wc_buf (const char *begin, const char *end)
 {
+#if MBS_SUPPORT
   unsigned char eol = eolbyte;
   size_t remain_bytes, i;
 
@@ -3188,9 +3189,8 @@ prepare_wc_buf (const char *begin, const char *end)
   buf_end = (unsigned char *) (begin + i);
   mblen_buf[i] = 0;
   inputwcs[i] = 0; /* sentinel */
-}
-
 #endif /* MBS_SUPPORT */
+}
 
 /* Search through a buffer looking for a match to the given struct dfa.
    Find the first occurrence of a string matching the regexp in the

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Fri Sep 16 08:52:03 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R4Xtj-0003tC-Cb
	for mharc-grep-commit@gnu.org; Fri, 16 Sep 2011 08:52:03 -0400
Received: from eggs.gnu.org ([140.186.70.92]:36175)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4Xtb-0003st-9C
	for grep-commit@gnu.org; Fri, 16 Sep 2011 08:52:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4XtS-0005s8-CX
	for grep-commit@gnu.org; Fri, 16 Sep 2011 08:51:55 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57710)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1R4XtS-0005s3-8w
	for grep-commit@gnu.org; Fri, 16 Sep 2011 08:51:46 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1R4XtR-0007Wp-P8
	for grep-commit@gnu.org; Fri, 16 Sep 2011 12:51:45 +0000
Date: Fri, 16 Sep 2011 12:51:45 +0000
Message-Id: <E1R4XtR-0007Wp-P8@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-59-g49684e0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 93927af364aa09dc23a50ca8e4c9a62af0132c59
X-Git-Newrev: 49684e05ed0362928b9fd2d14ecc3153300b702f
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Sep 2011 12:52:01 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  49684e05ed0362928b9fd2d14ecc3153300b702f (commit)
       via  eb0e2d9d2b2d5930842e6b60a8e6e71f75378644 (commit)
       via  786c10af2b70ed6f585362185a76566ba3e84a91 (commit)
       via  ba10005a6df3c2bb94cf85a6ddb28b26ff459af7 (commit)
      from  93927af364aa09dc23a50ca8e4c9a62af0132c59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=49684e05ed0362928b9fd2d14ecc3153300b702f


commit 49684e05ed0362928b9fd2d14ecc3153300b702f
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon Sep 12 15:34:17 2011 +0200

    maint: dfa: simplify multi-byte-related conditionals
    
    * src/dfa.c (setbit_case_fold_c, parse_bracket_exp, lex):
    (addtok_mb, dfaparse): Change each "MBS_SUPPORT && MB_CUR_MAX > 1"
    test to just "MB_CUR_MAX > 1".
    * src/dfasearch.c (kwsincr_case, EGexecute): Likewise.
    * src/kwsearch.c (Fcompile, Fexecute): Likewise.
    * src/searchutils.c (kwsinit): Likewise.
    * src/dfa.c (parse_bracket_exp): Convert
    "if (!MBS_SUPPORT || MB_CUR_MAX == 1)" to
    "if (MB_CUR_MAX == 1)" and do this:
    -      assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
    +      assert(MB_CUR_MAX == 1);

diff --git a/src/dfa.c b/src/dfa.c
index a57353e..8611435 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -590,7 +590,7 @@ static inline bool setbit_wc (wint_t wc, charclass c) { abort (); }
 static void
 setbit_case_fold_c (int b, charclass c)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       wint_t wc = btowc (b);
       if (wc == WEOF)
@@ -834,7 +834,7 @@ parse_bracket_exp (void)
           /* If pattern contains `[[:', `[[.', or `[[='.  */
           if (c1 == ':'
               /* TODO: handle `[[.' and `[[=' also for MB_CUR_MAX == 1.  */
-              || (MBS_SUPPORT && MB_CUR_MAX > 1 && (c1 == '.' || c1 == '='))
+              || (MB_CUR_MAX > 1 && (c1 == '.' || c1 == '='))
               )
             {
               size_t len = 0;
@@ -865,7 +865,7 @@ parse_bracket_exp (void)
                   if (!pred)
                     dfaerror(_("invalid character class"));
 
-                  if (MBS_SUPPORT && MB_CUR_MAX > 1 && !pred->single_byte_only)
+                  if (MB_CUR_MAX > 1 && !pred->single_byte_only)
                     {
                       /* Store the character class as wctype_t.  */
                       wctype_t wt = wctype (class);
@@ -947,7 +947,7 @@ parse_bracket_exp (void)
               && (syntax_bits & RE_BACKSLASH_ESCAPE_IN_LISTS))
             FETCH_WC(c2, wc2, _("unbalanced ["));
 
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             {
               /* When case folding map a range, say [m-z] (or even [M-z])
                  to the pair of ranges, [m-z] [M-Z].  */
@@ -1014,7 +1014,7 @@ parse_bracket_exp (void)
 
       colon_warning_state |= (c == ':') ? 2 : 4;
 
-      if (!MBS_SUPPORT || MB_CUR_MAX == 1)
+      if (MB_CUR_MAX == 1)
         {
           setbit_case_fold_c (c, ccl);
           continue;
@@ -1047,7 +1047,7 @@ parse_bracket_exp (void)
   if (colon_warning_state == 7)
     dfawarn (_("character class syntax is [[:space:]], not [:space:]"));
 
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       static charclass zeroclass;
       work_mbc->invert = invert;
@@ -1057,7 +1057,7 @@ parse_bracket_exp (void)
 
   if (invert)
     {
-      assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
+      assert(MB_CUR_MAX == 1);
       notset(ccl);
       if (syntax_bits & RE_HAT_LISTS_NOT_NEWLINE)
         clrbit(eolbyte, ccl);
@@ -1085,7 +1085,7 @@ lex (void)
      "if (backslash) ...".  */
   for (i = 0; i < 2; ++i)
     {
-      if (MBS_SUPPORT && MB_CUR_MAX > 1)
+      if (MB_CUR_MAX > 1)
         {
           FETCH_WC (c, wctok, NULL);
           if ((int)c == EOF)
@@ -1314,7 +1314,7 @@ lex (void)
         case '.':
           if (backslash)
             goto normal_char;
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             {
               /* In multibyte environment period must match with a single
                  character not a byte.  So we use ANYCHAR.  */
@@ -1367,7 +1367,7 @@ lex (void)
           laststart = 0;
           /* For multibyte character sets, folding is done in atom.  Always
              return WCHAR.  */
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             return lasttok = WCHAR;
 
           if (case_fold && isalpha(c))
@@ -1399,7 +1399,7 @@ static int depth;		/* Current depth of a hypothetical stack
 static void
 addtok_mb (token t, int mbprop)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       REALLOC_IF_NECESSARY(dfa->multibyte_prop, dfa->nmultibyte_prop,
                            dfa->tindex + 1);
@@ -1438,7 +1438,7 @@ static void addtok_wc (wint_t wc);
 static void
 addtok (token t)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1 && t == MBCSET)
+  if (MB_CUR_MAX > 1 && t == MBCSET)
     {
       bool need_or = false;
       struct mb_char_classes *work_mbc = &dfa->mbcsets[dfa->nmbcsets - 1];
@@ -1694,7 +1694,7 @@ copytoks (int tindex, int ntokens)
     {
       addtok(dfa->tokens[tindex + i]);
       /* Update index into multibyte csets.  */
-      if (MBS_SUPPORT && MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
+      if (MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
         dfa->multibyte_prop[dfa->tindex - 1] = dfa->multibyte_prop[tindex + i];
     }
 }
@@ -1778,7 +1778,7 @@ dfaparse (char const *s, size_t len, struct dfa *d)
 #ifdef LC_COLLATE
   hard_LC_COLLATE = hard_locale (LC_COLLATE);
 #endif
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       cur_mb_len = 0;
       memset(&mbs, 0, sizeof mbs);
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 68c1966..c6fe1a5 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -77,7 +77,7 @@ static char const *
 kwsincr_case (const char *must)
 {
   size_t n = strlen (must);
-  const char *buf = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+  const char *buf = (match_icase && MB_CUR_MAX > 1
                      ? mbtolower (must, &n)
                      : must);
   return kwsincr (kwset, buf, n);
@@ -214,7 +214,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
   int backref, start, len, best_len;
   struct kwsmatch kwsm;
   size_t i, ret_val;
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       if (match_icase)
         {
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 8911f3f..a481cfa 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -34,7 +34,7 @@ Fcompile (char const *pattern, size_t size)
 {
   char const *err;
   size_t psize = size;
-  char const *pat = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+  char const *pat = (match_icase && MB_CUR_MAX > 1
                      ? mbtolower (pattern, &psize)
                      : pattern);
 
@@ -83,7 +83,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
   char eol = eolbyte;
   struct kwsmatch kwsmatch;
   size_t ret_val;
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       if (match_icase)
         {
@@ -100,8 +100,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
       if (offset == (size_t) -1)
         goto failure;
       len = kwsmatch.size[0];
-      if (MBS_SUPPORT
-          && MB_CUR_MAX > 1
+      if (MB_CUR_MAX > 1
           && is_mb_middle (&mb_start, beg + offset, buf + size, len))
         {
           /* The match was a part of multibyte character, advance at least
diff --git a/src/searchutils.c b/src/searchutils.c
index e6a5cbb..3b3ae67 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -28,7 +28,7 @@ kwsinit (kwset_t *kwset)
   static char trans[NCHAR];
   int i;
 
-  if (match_icase && MBS_SUPPORT && MB_CUR_MAX == 1)
+  if (match_icase && MB_CUR_MAX == 1)
     {
       for (i = 0; i < NCHAR; ++i)
         trans[i] = tolower (i);

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=eb0e2d9d2b2d5930842e6b60a8e6e71f75378644


commit 49684e05ed0362928b9fd2d14ecc3153300b702f
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon Sep 12 15:34:17 2011 +0200

    maint: dfa: simplify multi-byte-related conditionals
    
    * src/dfa.c (setbit_case_fold_c, parse_bracket_exp, lex):
    (addtok_mb, dfaparse): Change each "MBS_SUPPORT && MB_CUR_MAX > 1"
    test to just "MB_CUR_MAX > 1".
    * src/dfasearch.c (kwsincr_case, EGexecute): Likewise.
    * src/kwsearch.c (Fcompile, Fexecute): Likewise.
    * src/searchutils.c (kwsinit): Likewise.
    * src/dfa.c (parse_bracket_exp): Convert
    "if (!MBS_SUPPORT || MB_CUR_MAX == 1)" to
    "if (MB_CUR_MAX == 1)" and do this:
    -      assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
    +      assert(MB_CUR_MAX == 1);

diff --git a/src/dfa.c b/src/dfa.c
index a57353e..8611435 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -590,7 +590,7 @@ static inline bool setbit_wc (wint_t wc, charclass c) { abort (); }
 static void
 setbit_case_fold_c (int b, charclass c)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       wint_t wc = btowc (b);
       if (wc == WEOF)
@@ -834,7 +834,7 @@ parse_bracket_exp (void)
           /* If pattern contains `[[:', `[[.', or `[[='.  */
           if (c1 == ':'
               /* TODO: handle `[[.' and `[[=' also for MB_CUR_MAX == 1.  */
-              || (MBS_SUPPORT && MB_CUR_MAX > 1 && (c1 == '.' || c1 == '='))
+              || (MB_CUR_MAX > 1 && (c1 == '.' || c1 == '='))
               )
             {
               size_t len = 0;
@@ -865,7 +865,7 @@ parse_bracket_exp (void)
                   if (!pred)
                     dfaerror(_("invalid character class"));
 
-                  if (MBS_SUPPORT && MB_CUR_MAX > 1 && !pred->single_byte_only)
+                  if (MB_CUR_MAX > 1 && !pred->single_byte_only)
                     {
                       /* Store the character class as wctype_t.  */
                       wctype_t wt = wctype (class);
@@ -947,7 +947,7 @@ parse_bracket_exp (void)
               && (syntax_bits & RE_BACKSLASH_ESCAPE_IN_LISTS))
             FETCH_WC(c2, wc2, _("unbalanced ["));
 
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             {
               /* When case folding map a range, say [m-z] (or even [M-z])
                  to the pair of ranges, [m-z] [M-Z].  */
@@ -1014,7 +1014,7 @@ parse_bracket_exp (void)
 
       colon_warning_state |= (c == ':') ? 2 : 4;
 
-      if (!MBS_SUPPORT || MB_CUR_MAX == 1)
+      if (MB_CUR_MAX == 1)
         {
           setbit_case_fold_c (c, ccl);
           continue;
@@ -1047,7 +1047,7 @@ parse_bracket_exp (void)
   if (colon_warning_state == 7)
     dfawarn (_("character class syntax is [[:space:]], not [:space:]"));
 
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       static charclass zeroclass;
       work_mbc->invert = invert;
@@ -1057,7 +1057,7 @@ parse_bracket_exp (void)
 
   if (invert)
     {
-      assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
+      assert(MB_CUR_MAX == 1);
       notset(ccl);
       if (syntax_bits & RE_HAT_LISTS_NOT_NEWLINE)
         clrbit(eolbyte, ccl);
@@ -1085,7 +1085,7 @@ lex (void)
      "if (backslash) ...".  */
   for (i = 0; i < 2; ++i)
     {
-      if (MBS_SUPPORT && MB_CUR_MAX > 1)
+      if (MB_CUR_MAX > 1)
         {
           FETCH_WC (c, wctok, NULL);
           if ((int)c == EOF)
@@ -1314,7 +1314,7 @@ lex (void)
         case '.':
           if (backslash)
             goto normal_char;
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             {
               /* In multibyte environment period must match with a single
                  character not a byte.  So we use ANYCHAR.  */
@@ -1367,7 +1367,7 @@ lex (void)
           laststart = 0;
           /* For multibyte character sets, folding is done in atom.  Always
              return WCHAR.  */
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             return lasttok = WCHAR;
 
           if (case_fold && isalpha(c))
@@ -1399,7 +1399,7 @@ static int depth;		/* Current depth of a hypothetical stack
 static void
 addtok_mb (token t, int mbprop)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       REALLOC_IF_NECESSARY(dfa->multibyte_prop, dfa->nmultibyte_prop,
                            dfa->tindex + 1);
@@ -1438,7 +1438,7 @@ static void addtok_wc (wint_t wc);
 static void
 addtok (token t)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1 && t == MBCSET)
+  if (MB_CUR_MAX > 1 && t == MBCSET)
     {
       bool need_or = false;
       struct mb_char_classes *work_mbc = &dfa->mbcsets[dfa->nmbcsets - 1];
@@ -1694,7 +1694,7 @@ copytoks (int tindex, int ntokens)
     {
       addtok(dfa->tokens[tindex + i]);
       /* Update index into multibyte csets.  */
-      if (MBS_SUPPORT && MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
+      if (MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
         dfa->multibyte_prop[dfa->tindex - 1] = dfa->multibyte_prop[tindex + i];
     }
 }
@@ -1778,7 +1778,7 @@ dfaparse (char const *s, size_t len, struct dfa *d)
 #ifdef LC_COLLATE
   hard_LC_COLLATE = hard_locale (LC_COLLATE);
 #endif
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       cur_mb_len = 0;
       memset(&mbs, 0, sizeof mbs);
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 68c1966..c6fe1a5 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -77,7 +77,7 @@ static char const *
 kwsincr_case (const char *must)
 {
   size_t n = strlen (must);
-  const char *buf = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+  const char *buf = (match_icase && MB_CUR_MAX > 1
                      ? mbtolower (must, &n)
                      : must);
   return kwsincr (kwset, buf, n);
@@ -214,7 +214,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
   int backref, start, len, best_len;
   struct kwsmatch kwsm;
   size_t i, ret_val;
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       if (match_icase)
         {
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 8911f3f..a481cfa 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -34,7 +34,7 @@ Fcompile (char const *pattern, size_t size)
 {
   char const *err;
   size_t psize = size;
-  char const *pat = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+  char const *pat = (match_icase && MB_CUR_MAX > 1
                      ? mbtolower (pattern, &psize)
                      : pattern);
 
@@ -83,7 +83,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
   char eol = eolbyte;
   struct kwsmatch kwsmatch;
   size_t ret_val;
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       if (match_icase)
         {
@@ -100,8 +100,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
       if (offset == (size_t) -1)
         goto failure;
       len = kwsmatch.size[0];
-      if (MBS_SUPPORT
-          && MB_CUR_MAX > 1
+      if (MB_CUR_MAX > 1
           && is_mb_middle (&mb_start, beg + offset, buf + size, len))
         {
           /* The match was a part of multibyte character, advance at least
diff --git a/src/searchutils.c b/src/searchutils.c
index e6a5cbb..3b3ae67 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -28,7 +28,7 @@ kwsinit (kwset_t *kwset)
   static char trans[NCHAR];
   int i;
 
-  if (match_icase && MBS_SUPPORT && MB_CUR_MAX == 1)
+  if (match_icase && MB_CUR_MAX == 1)
     {
       for (i = 0; i < NCHAR; ++i)
         trans[i] = tolower (i);

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=786c10af2b70ed6f585362185a76566ba3e84a91


commit 49684e05ed0362928b9fd2d14ecc3153300b702f
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon Sep 12 15:34:17 2011 +0200

    maint: dfa: simplify multi-byte-related conditionals
    
    * src/dfa.c (setbit_case_fold_c, parse_bracket_exp, lex):
    (addtok_mb, dfaparse): Change each "MBS_SUPPORT && MB_CUR_MAX > 1"
    test to just "MB_CUR_MAX > 1".
    * src/dfasearch.c (kwsincr_case, EGexecute): Likewise.
    * src/kwsearch.c (Fcompile, Fexecute): Likewise.
    * src/searchutils.c (kwsinit): Likewise.
    * src/dfa.c (parse_bracket_exp): Convert
    "if (!MBS_SUPPORT || MB_CUR_MAX == 1)" to
    "if (MB_CUR_MAX == 1)" and do this:
    -      assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
    +      assert(MB_CUR_MAX == 1);

diff --git a/src/dfa.c b/src/dfa.c
index a57353e..8611435 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -590,7 +590,7 @@ static inline bool setbit_wc (wint_t wc, charclass c) { abort (); }
 static void
 setbit_case_fold_c (int b, charclass c)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       wint_t wc = btowc (b);
       if (wc == WEOF)
@@ -834,7 +834,7 @@ parse_bracket_exp (void)
           /* If pattern contains `[[:', `[[.', or `[[='.  */
           if (c1 == ':'
               /* TODO: handle `[[.' and `[[=' also for MB_CUR_MAX == 1.  */
-              || (MBS_SUPPORT && MB_CUR_MAX > 1 && (c1 == '.' || c1 == '='))
+              || (MB_CUR_MAX > 1 && (c1 == '.' || c1 == '='))
               )
             {
               size_t len = 0;
@@ -865,7 +865,7 @@ parse_bracket_exp (void)
                   if (!pred)
                     dfaerror(_("invalid character class"));
 
-                  if (MBS_SUPPORT && MB_CUR_MAX > 1 && !pred->single_byte_only)
+                  if (MB_CUR_MAX > 1 && !pred->single_byte_only)
                     {
                       /* Store the character class as wctype_t.  */
                       wctype_t wt = wctype (class);
@@ -947,7 +947,7 @@ parse_bracket_exp (void)
               && (syntax_bits & RE_BACKSLASH_ESCAPE_IN_LISTS))
             FETCH_WC(c2, wc2, _("unbalanced ["));
 
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             {
               /* When case folding map a range, say [m-z] (or even [M-z])
                  to the pair of ranges, [m-z] [M-Z].  */
@@ -1014,7 +1014,7 @@ parse_bracket_exp (void)
 
       colon_warning_state |= (c == ':') ? 2 : 4;
 
-      if (!MBS_SUPPORT || MB_CUR_MAX == 1)
+      if (MB_CUR_MAX == 1)
         {
           setbit_case_fold_c (c, ccl);
           continue;
@@ -1047,7 +1047,7 @@ parse_bracket_exp (void)
   if (colon_warning_state == 7)
     dfawarn (_("character class syntax is [[:space:]], not [:space:]"));
 
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       static charclass zeroclass;
       work_mbc->invert = invert;
@@ -1057,7 +1057,7 @@ parse_bracket_exp (void)
 
   if (invert)
     {
-      assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
+      assert(MB_CUR_MAX == 1);
       notset(ccl);
       if (syntax_bits & RE_HAT_LISTS_NOT_NEWLINE)
         clrbit(eolbyte, ccl);
@@ -1085,7 +1085,7 @@ lex (void)
      "if (backslash) ...".  */
   for (i = 0; i < 2; ++i)
     {
-      if (MBS_SUPPORT && MB_CUR_MAX > 1)
+      if (MB_CUR_MAX > 1)
         {
           FETCH_WC (c, wctok, NULL);
           if ((int)c == EOF)
@@ -1314,7 +1314,7 @@ lex (void)
         case '.':
           if (backslash)
             goto normal_char;
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             {
               /* In multibyte environment period must match with a single
                  character not a byte.  So we use ANYCHAR.  */
@@ -1367,7 +1367,7 @@ lex (void)
           laststart = 0;
           /* For multibyte character sets, folding is done in atom.  Always
              return WCHAR.  */
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             return lasttok = WCHAR;
 
           if (case_fold && isalpha(c))
@@ -1399,7 +1399,7 @@ static int depth;		/* Current depth of a hypothetical stack
 static void
 addtok_mb (token t, int mbprop)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       REALLOC_IF_NECESSARY(dfa->multibyte_prop, dfa->nmultibyte_prop,
                            dfa->tindex + 1);
@@ -1438,7 +1438,7 @@ static void addtok_wc (wint_t wc);
 static void
 addtok (token t)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1 && t == MBCSET)
+  if (MB_CUR_MAX > 1 && t == MBCSET)
     {
       bool need_or = false;
       struct mb_char_classes *work_mbc = &dfa->mbcsets[dfa->nmbcsets - 1];
@@ -1694,7 +1694,7 @@ copytoks (int tindex, int ntokens)
     {
       addtok(dfa->tokens[tindex + i]);
       /* Update index into multibyte csets.  */
-      if (MBS_SUPPORT && MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
+      if (MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
         dfa->multibyte_prop[dfa->tindex - 1] = dfa->multibyte_prop[tindex + i];
     }
 }
@@ -1778,7 +1778,7 @@ dfaparse (char const *s, size_t len, struct dfa *d)
 #ifdef LC_COLLATE
   hard_LC_COLLATE = hard_locale (LC_COLLATE);
 #endif
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       cur_mb_len = 0;
       memset(&mbs, 0, sizeof mbs);
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 68c1966..c6fe1a5 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -77,7 +77,7 @@ static char const *
 kwsincr_case (const char *must)
 {
   size_t n = strlen (must);
-  const char *buf = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+  const char *buf = (match_icase && MB_CUR_MAX > 1
                      ? mbtolower (must, &n)
                      : must);
   return kwsincr (kwset, buf, n);
@@ -214,7 +214,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
   int backref, start, len, best_len;
   struct kwsmatch kwsm;
   size_t i, ret_val;
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       if (match_icase)
         {
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 8911f3f..a481cfa 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -34,7 +34,7 @@ Fcompile (char const *pattern, size_t size)
 {
   char const *err;
   size_t psize = size;
-  char const *pat = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+  char const *pat = (match_icase && MB_CUR_MAX > 1
                      ? mbtolower (pattern, &psize)
                      : pattern);
 
@@ -83,7 +83,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
   char eol = eolbyte;
   struct kwsmatch kwsmatch;
   size_t ret_val;
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       if (match_icase)
         {
@@ -100,8 +100,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
       if (offset == (size_t) -1)
         goto failure;
       len = kwsmatch.size[0];
-      if (MBS_SUPPORT
-          && MB_CUR_MAX > 1
+      if (MB_CUR_MAX > 1
           && is_mb_middle (&mb_start, beg + offset, buf + size, len))
         {
           /* The match was a part of multibyte character, advance at least
diff --git a/src/searchutils.c b/src/searchutils.c
index e6a5cbb..3b3ae67 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -28,7 +28,7 @@ kwsinit (kwset_t *kwset)
   static char trans[NCHAR];
   int i;
 
-  if (match_icase && MBS_SUPPORT && MB_CUR_MAX == 1)
+  if (match_icase && MB_CUR_MAX == 1)
     {
       for (i = 0; i < NCHAR; ++i)
         trans[i] = tolower (i);

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ba10005a6df3c2bb94cf85a6ddb28b26ff459af7


commit 49684e05ed0362928b9fd2d14ecc3153300b702f
Author: Jim Meyering <meyering@redhat.com>
Date:   Mon Sep 12 15:34:17 2011 +0200

    maint: dfa: simplify multi-byte-related conditionals
    
    * src/dfa.c (setbit_case_fold_c, parse_bracket_exp, lex):
    (addtok_mb, dfaparse): Change each "MBS_SUPPORT && MB_CUR_MAX > 1"
    test to just "MB_CUR_MAX > 1".
    * src/dfasearch.c (kwsincr_case, EGexecute): Likewise.
    * src/kwsearch.c (Fcompile, Fexecute): Likewise.
    * src/searchutils.c (kwsinit): Likewise.
    * src/dfa.c (parse_bracket_exp): Convert
    "if (!MBS_SUPPORT || MB_CUR_MAX == 1)" to
    "if (MB_CUR_MAX == 1)" and do this:
    -      assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
    +      assert(MB_CUR_MAX == 1);

diff --git a/src/dfa.c b/src/dfa.c
index a57353e..8611435 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -590,7 +590,7 @@ static inline bool setbit_wc (wint_t wc, charclass c) { abort (); }
 static void
 setbit_case_fold_c (int b, charclass c)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       wint_t wc = btowc (b);
       if (wc == WEOF)
@@ -834,7 +834,7 @@ parse_bracket_exp (void)
           /* If pattern contains `[[:', `[[.', or `[[='.  */
           if (c1 == ':'
               /* TODO: handle `[[.' and `[[=' also for MB_CUR_MAX == 1.  */
-              || (MBS_SUPPORT && MB_CUR_MAX > 1 && (c1 == '.' || c1 == '='))
+              || (MB_CUR_MAX > 1 && (c1 == '.' || c1 == '='))
               )
             {
               size_t len = 0;
@@ -865,7 +865,7 @@ parse_bracket_exp (void)
                   if (!pred)
                     dfaerror(_("invalid character class"));
 
-                  if (MBS_SUPPORT && MB_CUR_MAX > 1 && !pred->single_byte_only)
+                  if (MB_CUR_MAX > 1 && !pred->single_byte_only)
                     {
                       /* Store the character class as wctype_t.  */
                       wctype_t wt = wctype (class);
@@ -947,7 +947,7 @@ parse_bracket_exp (void)
               && (syntax_bits & RE_BACKSLASH_ESCAPE_IN_LISTS))
             FETCH_WC(c2, wc2, _("unbalanced ["));
 
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             {
               /* When case folding map a range, say [m-z] (or even [M-z])
                  to the pair of ranges, [m-z] [M-Z].  */
@@ -1014,7 +1014,7 @@ parse_bracket_exp (void)
 
       colon_warning_state |= (c == ':') ? 2 : 4;
 
-      if (!MBS_SUPPORT || MB_CUR_MAX == 1)
+      if (MB_CUR_MAX == 1)
         {
           setbit_case_fold_c (c, ccl);
           continue;
@@ -1047,7 +1047,7 @@ parse_bracket_exp (void)
   if (colon_warning_state == 7)
     dfawarn (_("character class syntax is [[:space:]], not [:space:]"));
 
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       static charclass zeroclass;
       work_mbc->invert = invert;
@@ -1057,7 +1057,7 @@ parse_bracket_exp (void)
 
   if (invert)
     {
-      assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
+      assert(MB_CUR_MAX == 1);
       notset(ccl);
       if (syntax_bits & RE_HAT_LISTS_NOT_NEWLINE)
         clrbit(eolbyte, ccl);
@@ -1085,7 +1085,7 @@ lex (void)
      "if (backslash) ...".  */
   for (i = 0; i < 2; ++i)
     {
-      if (MBS_SUPPORT && MB_CUR_MAX > 1)
+      if (MB_CUR_MAX > 1)
         {
           FETCH_WC (c, wctok, NULL);
           if ((int)c == EOF)
@@ -1314,7 +1314,7 @@ lex (void)
         case '.':
           if (backslash)
             goto normal_char;
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             {
               /* In multibyte environment period must match with a single
                  character not a byte.  So we use ANYCHAR.  */
@@ -1367,7 +1367,7 @@ lex (void)
           laststart = 0;
           /* For multibyte character sets, folding is done in atom.  Always
              return WCHAR.  */
-          if (MBS_SUPPORT && MB_CUR_MAX > 1)
+          if (MB_CUR_MAX > 1)
             return lasttok = WCHAR;
 
           if (case_fold && isalpha(c))
@@ -1399,7 +1399,7 @@ static int depth;		/* Current depth of a hypothetical stack
 static void
 addtok_mb (token t, int mbprop)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       REALLOC_IF_NECESSARY(dfa->multibyte_prop, dfa->nmultibyte_prop,
                            dfa->tindex + 1);
@@ -1438,7 +1438,7 @@ static void addtok_wc (wint_t wc);
 static void
 addtok (token t)
 {
-  if (MBS_SUPPORT && MB_CUR_MAX > 1 && t == MBCSET)
+  if (MB_CUR_MAX > 1 && t == MBCSET)
     {
       bool need_or = false;
       struct mb_char_classes *work_mbc = &dfa->mbcsets[dfa->nmbcsets - 1];
@@ -1694,7 +1694,7 @@ copytoks (int tindex, int ntokens)
     {
       addtok(dfa->tokens[tindex + i]);
       /* Update index into multibyte csets.  */
-      if (MBS_SUPPORT && MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
+      if (MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
         dfa->multibyte_prop[dfa->tindex - 1] = dfa->multibyte_prop[tindex + i];
     }
 }
@@ -1778,7 +1778,7 @@ dfaparse (char const *s, size_t len, struct dfa *d)
 #ifdef LC_COLLATE
   hard_LC_COLLATE = hard_locale (LC_COLLATE);
 #endif
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       cur_mb_len = 0;
       memset(&mbs, 0, sizeof mbs);
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 68c1966..c6fe1a5 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -77,7 +77,7 @@ static char const *
 kwsincr_case (const char *must)
 {
   size_t n = strlen (must);
-  const char *buf = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+  const char *buf = (match_icase && MB_CUR_MAX > 1
                      ? mbtolower (must, &n)
                      : must);
   return kwsincr (kwset, buf, n);
@@ -214,7 +214,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
   int backref, start, len, best_len;
   struct kwsmatch kwsm;
   size_t i, ret_val;
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       if (match_icase)
         {
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 8911f3f..a481cfa 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -34,7 +34,7 @@ Fcompile (char const *pattern, size_t size)
 {
   char const *err;
   size_t psize = size;
-  char const *pat = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+  char const *pat = (match_icase && MB_CUR_MAX > 1
                      ? mbtolower (pattern, &psize)
                      : pattern);
 
@@ -83,7 +83,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
   char eol = eolbyte;
   struct kwsmatch kwsmatch;
   size_t ret_val;
-  if (MBS_SUPPORT && MB_CUR_MAX > 1)
+  if (MB_CUR_MAX > 1)
     {
       if (match_icase)
         {
@@ -100,8 +100,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
       if (offset == (size_t) -1)
         goto failure;
       len = kwsmatch.size[0];
-      if (MBS_SUPPORT
-          && MB_CUR_MAX > 1
+      if (MB_CUR_MAX > 1
           && is_mb_middle (&mb_start, beg + offset, buf + size, len))
         {
           /* The match was a part of multibyte character, advance at least
diff --git a/src/searchutils.c b/src/searchutils.c
index e6a5cbb..3b3ae67 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -28,7 +28,7 @@ kwsinit (kwset_t *kwset)
   static char trans[NCHAR];
   int i;
 
-  if (match_icase && MBS_SUPPORT && MB_CUR_MAX == 1)
+  if (match_icase && MB_CUR_MAX == 1)
     {
       for (i = 0; i < NCHAR; ++i)
         trans[i] = tolower (i);

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c         |   51 +++++++++++++++++++++++----------------------------
 src/dfasearch.c   |    4 ++--
 src/kwsearch.c    |    7 +++----
 src/mbsupport.h   |    5 +++++
 src/searchutils.c |    2 +-
 5 files changed, 34 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
grep


