From d835285804942758507f63816504731aea8c9b60 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 19 Jan 2010 09:23:51 +0100 Subject: [PATCH] regcomp.c: spelling and merge-artifact from glibc * lib/regcomp.c: Merge remainder of glibc's 2da42bc06566bc89785e580fa1ac89b4c9f2a63c. --- ChangeLog | 4 ++++ lib/regcomp.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9024843d3a..2a6068088c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-01-28 Jim Meyering + regcomp.c: spelling and merge-artifact from glibc + * lib/regcomp.c: Merge remainder of glibc's + 2da42bc06566bc89785e580fa1ac89b4c9f2a63c. + regcomp.c: sync white-space changes from glibc * lib/regcomp.c: Merge to accommodate white space changes from glibc's 2da42bc06566bc89785e580fa1ac89b4c9f2a63c. diff --git a/lib/regcomp.c b/lib/regcomp.c index 6e87a48aff..c653511add 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1682,10 +1682,9 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root) { reg_errcode_t err; Idx i; - bool incomplete; - bool ok; re_node_set eclosure; - incomplete = false; + bool ok; + bool incomplete = false; err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1); if (BE (err != REG_NOERROR, 0)) return err; @@ -1742,7 +1741,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root) } } - /* Epsilon closures include itself. */ + /* An epsilon closure includes itself. */ ok = re_node_set_insert (&eclosure, node); if (BE (! ok, 0)) return REG_ESPACE; -- 2.30.2