[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/34] maint: convert #if-MBS_SUPPORT (EGexecute)
From: |
Jim Meyering |
Subject: |
[PATCH 04/34] maint: convert #if-MBS_SUPPORT (EGexecute) |
Date: |
Thu, 15 Sep 2011 12:27:47 +0200 |
From: Jim Meyering <address@hidden>
* src/dfasearch.c (EGexecute): Remove in-function #if MBS_SUPPORT.
---
src/dfasearch.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 7fd57c4..68c1966 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -214,8 +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
- if (MB_CUR_MAX > 1)
+ if (MBS_SUPPORT && MB_CUR_MAX > 1)
{
if (match_icase)
{
@@ -227,7 +226,6 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
buf = case_buf;
}
}
-#endif /* MBS_SUPPORT */
mb_start = buf;
buflim = buf + size;
@@ -255,13 +253,14 @@ EGexecute (char const *buf, size_t size, size_t
*match_size,
--beg;
if (kwsm.index < kwset_exact_matches)
{
-#if MBS_SUPPORT
+ if (!MBS_SUPPORT)
+ goto success;
+
if (mb_start < beg)
mb_start = beg;
if (MB_CUR_MAX == 1
|| !is_mb_middle (&mb_start, match, buflim,
kwsm.size[0]))
-#endif
goto success;
}
if (dfaexec (dfa, beg, (char *) end, 0, NULL, &backref) == NULL)
--
1.7.7.rc0.362.g5a14
- dfa/MBS_SUPPORT cleanup, Jim Meyering, 2011/09/15
- [PATCH 04/34] maint: convert #if-MBS_SUPPORT (EGexecute),
Jim Meyering <=
[PATCH 02/34] maint: convert #if-MBS_SUPPORT (Fcompile, etc.), Jim Meyering, 2011/09/15
[PATCH 07/34] maint: dfa: convert #if-MBS_SUPPORT (dfafree), Jim Meyering, 2011/09/15
[PATCH 09/34] maint: dfa: convert #if-MBS_SUPPORT (free_mbdata), Jim Meyering, 2011/09/15
[PATCH 06/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp, part1), Jim Meyering, 2011/09/15