[PATCH 08/34] maint: dfa: convert #if-MBS_SUPPORT (dfaoptimize, dfacomp)

[Jim Meyering]

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

* src/dfa.c (dfaoptimize, dfacomp): Use regular "if",
not #if MBS_SUPPORT.
---
 src/dfa.c |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index 2c72d88..30013a2 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3465,33 +3465,34 @@ dfainit (struct dfa *d)
 #endif
 }

-#if MBS_SUPPORT
 static void
 dfaoptimize (struct dfa *d)
 {
-  unsigned int i;
-  if (!using_utf8())
-    return;
-
-  for (i = 0; i < d->tindex; ++i)
+  if (MBS_SUPPORT)
     {
-      switch(d->tokens[i])
+      unsigned int i;
+      if (!using_utf8())
+        return;
+
+      for (i = 0; i < d->tindex; ++i)
         {
-        case ANYCHAR:
-          /* Lowered.  */
-          abort ();
-        case MBCSET:
-          /* Requires multi-byte algorithm.  */
-          return;
-        default:
-          break;
+          switch(d->tokens[i])
+            {
+            case ANYCHAR:
+              /* Lowered.  */
+              abort ();
+            case MBCSET:
+              /* Requires multi-byte algorithm.  */
+              return;
+            default:
+              break;
+            }
         }
-    }

-  free_mbdata (d);
-  d->mb_cur_max = 1;
+      free_mbdata (d);
+      d->mb_cur_max = 1;
+    }
 }
-#endif

 /* Parse and analyze a single string of the given length. */
 void
@@ -3500,9 +3501,8 @@ dfacomp (char const *s, size_t len, struct dfa *d, int 
searchflag)
   dfainit(d);
   dfaparse(s, len, d);
   dfamust(d);
-#if MBS_SUPPORT
-  dfaoptimize(d);
-#endif
+  if (MBS_SUPPORT)
+    dfaoptimize(d);
   dfaanalyze(d, searchflag);
 }

-- 
1.7.7.rc0.362.g5a14