[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.9-54-gaeef122
|
From: |
Jim Meyering |
|
Subject: |
grep branch, master, updated. v2.9-54-gaeef122 |
|
Date: |
Fri, 16 Sep 2011 10:56: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 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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.9-54-gaeef122,
Jim Meyering <=