grep branch, master, updated. v2.10-5-ga46a6ac

[Jim Meyering]

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  a46a6acf2f8c052c3fcf3baaa1932ef3335a96b9 (commit)
       via  4cfdc71cc57ccf501e1ec97483576636615ce784 (commit)
      from  1de1d040273d4eae059ad6cd0feb696f86743b5f (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=a46a6acf2f8c052c3fcf3baaa1932ef3335a96b9


commit a46a6acf2f8c052c3fcf3baaa1932ef3335a96b9
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 20 18:37:19 2011 +0100

    maint: remove an avoidable #ifdef/#endif pair
    
    * src/dfa.c (dfaanalyze): Remove avoidable #ifdef around "{".

diff --git a/src/dfa.c b/src/dfa.c
index 8db4aba..dc89a76 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2122,9 +2122,7 @@ dfaanalyze (struct dfa *d, int searchflag)
   CALLOC(d->follows, d->tindex);
 
   for (i = 0; i < d->tindex; ++i)
-#ifdef DEBUG
-    {                          /* Nonsyntactic #ifdef goo... */
-#endif
+    {
     switch (d->tokens[i])
       {
       case EMPTY:
@@ -2249,8 +2247,8 @@ dfaanalyze (struct dfa *d, int searchflag)
           prtok(d->tokens[lastpos[j].index]);
         }
       putc('\n', stderr);
-    }
 #endif
+    }
 
   /* For each follow set that is the follow set of a real position, replace
      it with its epsilon closure. */

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=4cfdc71cc57ccf501e1ec97483576636615ce784


commit a46a6acf2f8c052c3fcf3baaa1932ef3335a96b9
Author: Jim Meyering <address@hidden>
Date:   Sun Nov 20 18:37:19 2011 +0100

    maint: remove an avoidable #ifdef/#endif pair
    
    * src/dfa.c (dfaanalyze): Remove avoidable #ifdef around "{".

diff --git a/src/dfa.c b/src/dfa.c
index 8db4aba..dc89a76 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2122,9 +2122,7 @@ dfaanalyze (struct dfa *d, int searchflag)
   CALLOC(d->follows, d->tindex);
 
   for (i = 0; i < d->tindex; ++i)
-#ifdef DEBUG
-    {                          /* Nonsyntactic #ifdef goo... */
-#endif
+    {
     switch (d->tokens[i])
       {
       case EMPTY:
@@ -2249,8 +2247,8 @@ dfaanalyze (struct dfa *d, int searchflag)
           prtok(d->tokens[lastpos[j].index]);
         }
       putc('\n', stderr);
-    }
 #endif
+    }
 
   /* For each follow set that is the follow set of a real position, replace
      it with its epsilon closure. */

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

Summary of changes:
 src/dfa.c                  |    6 ++----
 tests/word-delim-multibyte |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
grep