From: Paul Eggert Date: Tue, 17 Dec 2019 21:07:15 +0000 (-0800) Subject: dfa: tune via xzalloc X-Git-Tag: v1.0~4488 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d19dc9005f676282ae2745d1d740884fc3394379;p=gnulib.git dfa: tune via xzalloc * lib/dfa.c (dfaoptimize): Prefer xzalloc to xmalloc + memset. --- diff --git a/ChangeLog b/ChangeLog index 7925915f65..ce3f8b2b78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-12-17 Paul Eggert + + dfa: tune via xzalloc + * lib/dfa.c (dfaoptimize): Prefer xzalloc to xmalloc + memset. + 2019-12-17 Bruno Haible localcharset: Fix multithread-safety bug on Windows and OS/2. diff --git a/lib/dfa.c b/lib/dfa.c index 00347f9014..dd2fa84fd9 100644 --- a/lib/dfa.c +++ b/lib/dfa.c @@ -2473,12 +2473,7 @@ reorder_tokens (struct dfa *d) static void dfaoptimize (struct dfa *d) { - char *flags; - position_set merged0; - position_set *merged; - - flags = xmalloc (d->tindex * sizeof *flags); - memset (flags, 0, d->tindex * sizeof *flags); + char *flags = xzalloc (d->tindex); for (idx_t i = 0; i < d->tindex; i++) { @@ -2497,7 +2492,8 @@ dfaoptimize (struct dfa *d) flags[0] |= OPT_QUEUED; - merged = &merged0; + position_set merged0; + position_set *merged = &merged0; alloc_position_set (merged, d->nleaves); d->constraints = xnmalloc (d->tindex, sizeof *d->constraints);