[PATCH 03/34] maint: convert #if-MBS_SUPPORT (kwsincr_case)

[Jim Meyering]

From: Jim Meyering <meyer...@redhat.com>

* 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