From 1fb468215e69babcd55f784c5d3b11305f4078de Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Thu, 1 Apr 2010 17:13:44 +0200
Subject: maint: convert #if-MBS_SUPPORT (kwsincr_case)

* src/dfasearch.c (kwsincr_case): Remove in-function #if MBS_SUPPORT.
Move decl's down.
---
 src/dfasearch.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 34713087..7fd57c47 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);
 }
 
-- 
cgit v1.2.1