diff options
author | Jim Meyering <meyering@redhat.com> | 2010-04-01 17:43:19 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-09-16 10:30:38 +0200 |
commit | ed096a6722d11d6c4a04b48934d86f41f6147ed5 (patch) | |
tree | 7a6f95e4fc3bbdc4bcfb7fc88d7822fa9266eedb /src | |
parent | 2f3b76ae68b0e6951871d4ec9eaa7aafa7c3b12c (diff) | |
download | grep-ed096a6722d11d6c4a04b48934d86f41f6147ed5.tar.gz |
maint: dfa: convert #if-MBS_SUPPORT (dfaoptimize, dfacomp)
* src/dfa.c (dfaoptimize, dfacomp): Use regular "if",
not #if MBS_SUPPORT.
Diffstat (limited to 'src')
-rw-r--r-- | src/dfa.c | 44 |
1 files changed, 22 insertions, 22 deletions
@@ -3459,33 +3459,34 @@ dfainit (struct dfa *d) #endif } -#if MBS_SUPPORT static void dfaoptimize (struct dfa *d) { - unsigned int i; - if (!using_utf8()) - return; - - for (i = 0; i < d->tindex; ++i) + if (MBS_SUPPORT) { - switch(d->tokens[i]) + unsigned int i; + if (!using_utf8()) + return; + + for (i = 0; i < d->tindex; ++i) { - case ANYCHAR: - /* Lowered. */ - abort (); - case MBCSET: - /* Requires multi-byte algorithm. */ - return; - default: - break; + switch(d->tokens[i]) + { + 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; + } } -#endif /* Parse and analyze a single string of the given length. */ void @@ -3494,9 +3495,8 @@ 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); -#endif + if (MBS_SUPPORT) + dfaoptimize(d); dfaanalyze(d, searchflag); } |