[PATCH 13/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp)

[Jim Meyering]

From: Jim Meyering <address@hidden>

* src/dfa.c (parse_bracket_exp): Use regular "if", not #if MBS_SUPPORT.
---
 src/dfa.c |   39 +++++++++++++++++++--------------------
 1 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index f99ee15..840c57b 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1025,34 +1025,33 @@ parse_bracket_exp (void)

       colon_warning_state |= (c == ':') ? 2 : 4;

-#if MBS_SUPPORT
-      if (MB_CUR_MAX > 1)
+      if (!MBS_SUPPORT || MB_CUR_MAX <= 1)
         {
-          if (case_fold && iswalpha(wc))
-            {
-              wc = towlower(wc);
-              if (!setbit_wc (wc, ccl))
-                {
-                  REALLOC_IF_NECESSARY(work_mbc->chars, chars_al,
-                                       work_mbc->nchars + 1);
-                  work_mbc->chars[work_mbc->nchars++] = wc;
-                }
-#ifdef GREP
-              continue;
-#else
-              wc = towupper(wc);
-#endif
-            }
+          setbit_case_fold_c (c, ccl);
+          continue;
+        }
+
+      if (case_fold && iswalpha(wc))
+        {
+          wc = towlower(wc);
           if (!setbit_wc (wc, ccl))
             {
               REALLOC_IF_NECESSARY(work_mbc->chars, chars_al,
                                    work_mbc->nchars + 1);
               work_mbc->chars[work_mbc->nchars++] = wc;
             }
-        }
-      else
+#ifdef GREP
+          continue;
+#else
+          wc = towupper(wc);
 #endif
-        setbit_case_fold_c (c, ccl);
+        }
+      if (!setbit_wc (wc, ccl))
+        {
+          REALLOC_IF_NECESSARY(work_mbc->chars, chars_al,
+                               work_mbc->nchars + 1);
+          work_mbc->chars[work_mbc->nchars++] = wc;
+        }
     }
   while ((
 #if MBS_SUPPORT
-- 
1.7.7.rc0.362.g5a14