grep branch, master, updated. v2.10-52-g97eca79

[Paolo Bonzini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  97eca7990cfd661e51bb3337aef3105065b227c5 (commit)
      from  5036e6aedbe0dd4a3e9e0bcfcd2fd9ee88379244 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=97eca7990cfd661e51bb3337aef3105065b227c5


commit 97eca7990cfd661e51bb3337aef3105065b227c5
Author: Paolo Bonzini <address@hidden>
Date:   Tue Jan 3 14:12:39 2012 +0100

    dfa: fix rebase conflict
    
    * src/dfa.c (dfaanalyze): Fix reference to nalloc.

diff --git a/src/dfa.c b/src/dfa.c
index 1261994..2f751c6 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2242,7 +2242,7 @@ dfaanalyze (struct dfa *d, int searchflag)
         firstpos->constraint = lastpos->constraint = NO_CONSTRAINT;
 
         /* Allocate the follow set for this position. */
-        alloc_position_set(&d->follows[i], nalloc[i]);
+        alloc_position_set(&d->follows[i], 1);
         break;
       }
 #ifdef DEBUG

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
grep