[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/34] maint: convert #if-MBS_SUPPORT (kwsincr_case)
From: |
Jim Meyering |
Subject: |
[PATCH 03/34] maint: convert #if-MBS_SUPPORT (kwsincr_case) |
Date: |
Thu, 15 Sep 2011 12:27:46 +0200 |
From: Jim Meyering <address@hidden>
* src/dfasearch.c (kwsincr_case): Remove in-function #if MBS_SUPPORT.
Move decl's down.
---
src/dfasearch.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 3471308..7fd57c4 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -76,16 +76,10 @@ static int kwset_exact_matches;
static char const *
kwsincr_case (const char *must)
{
- const char *buf;
- size_t n;
-
- n = strlen (must);
-#if MBS_SUPPORT
- if (match_icase && MB_CUR_MAX > 1)
- buf = mbtolower (must, &n);
- else
-#endif
- buf = must;
+ size_t n = strlen (must);
+ const char *buf = (MBS_SUPPORT && match_icase && MB_CUR_MAX > 1
+ ? mbtolower (must, &n)
+ : must);
return kwsincr (kwset, buf, n);
}
--
1.7.7.rc0.362.g5a14
- [PATCH 06/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp, part1), (continued)
- [PATCH 17/34] maint: dfa: convert #if-MBS_SUPPORT (dfaparse), Jim Meyering, 2011/09/15
- [PATCH 14/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp), Jim Meyering, 2011/09/15
- [PATCH 18/34] maint: dfa: convert #if-MBS_SUPPORT (state_index), Jim Meyering, 2011/09/15
- [PATCH 28/34] maint: dfa: avoid in-function "#if MBS_SUPPORT" tests, Jim Meyering, 2011/09/15
- [PATCH 03/34] maint: convert #if-MBS_SUPPORT (kwsincr_case),
Jim Meyering <=
- [PATCH 33/34] maint: dfa: simplify multi-byte-related conditionals, Jim Meyering, 2011/09/15
- [PATCH 25/34] maint: remove #if MBS_SUPPORT around member declaration, Jim Meyering, 2011/09/15
- [PATCH 12/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp), Jim Meyering, 2011/09/15
- [PATCH 23/34] tests: make fmbtest explain (to stderr, not log) why it is skipped, Jim Meyering, 2011/09/15
- [PATCH 31/34] tests: skip sjis-mb when dfa.c is compiled without MB support, Jim Meyering, 2011/09/15
- [PATCH 20/34] maint: dfa: convert #if-MBS_SUPPORT (dfastate), Jim Meyering, 2011/09/15