Re: [PATCH 09/34] maint: dfa: convert #if-MBS_SUPPORT (free_mbdata)

[Paolo Bonzini]

On 09/15/2011 12:27 PM, Jim Meyering wrote:
> From: Jim Meyering<address@hidden>
>
> * src/dfa.c (free_mbdata): Use regular "if", not #if MBS_SUPPORT.
> ---
>   src/dfa.c |   47 ++++++++++++++++++++++++-----------------------
>   1 files changed, 24 insertions(+), 23 deletions(-)
>
> diff --git a/src/dfa.c b/src/dfa.c
> index 30013a2..acd99aa 100644
> --- a/src/dfa.c
> +++ b/src/dfa.c
> @@ -3407,38 +3407,39 @@ dfaexec (struct dfa *d, char const *begin, char *end,
>       }
>   }
>
> -#if MBS_SUPPORT
>   static void
>   free_mbdata (struct dfa *d)
>   {
> -  unsigned int i;
> +  if (MBS_SUPPORT)
> +    {
> +      unsigned int i;
>
> -  free(d->multibyte_prop);
> -  d->multibyte_prop = NULL;
> +      free(d->multibyte_prop);
> +      d->multibyte_prop = NULL;
>
> -  for (i = 0; i<  d->nmbcsets; ++i)
> -    {
> -      unsigned int j;
> -      struct mb_char_classes *p =&(d->mbcsets[i]);
> -      free(p->chars);
> -      free(p->ch_classes);
> -      free(p->range_sts);
> -      free(p->range_ends);
> +      for (i = 0; i<  d->nmbcsets; ++i)
> +        {
> +          unsigned int j;
> +          struct mb_char_classes *p =&(d->mbcsets[i]);
> +          free(p->chars);
> +          free(p->ch_classes);
> +          free(p->range_sts);
> +          free(p->range_ends);
>
> -      for (j = 0; j<  p->nequivs; ++j)
> -        free(p->equivs[j]);
> -      free(p->equivs);
> +          for (j = 0; j<  p->nequivs; ++j)
> +            free(p->equivs[j]);
> +          free(p->equivs);
>
> -      for (j = 0; j<  p->ncoll_elems; ++j)
> -        free(p->coll_elems[j]);
> -      free(p->coll_elems);
> -    }
> +          for (j = 0; j<  p->ncoll_elems; ++j)
> +            free(p->coll_elems[j]);
> +          free(p->coll_elems);
> +        }
>
> -  free(d->mbcsets);
> -  d->mbcsets = NULL;
> -  d->nmbcsets = 0;
> +      free(d->mbcsets);
> +      d->mbcsets = NULL;
> +      d->nmbcsets = 0;
> +    }
>   }
> -#endif
>
>   /* Initialize the components of a dfa that the other routines don't
>      initialize for themselves. */

Either here or later in the series, this if can be removed.

Paolo