From 49684e05ed0362928b9fd2d14ecc3153300b702f Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 12 Sep 2011 15:34:17 +0200 Subject: 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); --- src/searchutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/searchutils.c') diff --git a/src/searchutils.c b/src/searchutils.c index e6a5cbbb..3b3ae672 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); -- cgit v1.2.1