grep branch, master, updated. v2.19-10-gc32ff67

[Paul Eggert]

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  c32ff6730ce7fa6159f4bd3017b5e6b3c605461f (commit)
       via  268f80976577103d9bc9fe3006c05bf741060444 (commit)
       via  95a8f7b46a0a3d0915ba3a619ea1659c8485e89d (commit)
      from  7da358518836a0fdea84ee89a053f43f14fde633 (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=c32ff6730ce7fa6159f4bd3017b5e6b3c605461f


commit c32ff6730ce7fa6159f4bd3017b5e6b3c605461f
Author: Norihiro Tanaka <address@hidden>
Date:   Sat May 24 09:26:31 2014 +0900

    dfa: simplify building initial state
    
    build_state_zero doesn't need the struct dfa to be initialized,
    so remove the initialization and simplify.
    * src/dfa.c (build_state_zero): Remove.
    (dfaexec): Call realloc_trans_if_necessary and build_state directly.

diff --git a/src/dfa.c b/src/dfa.c
index dbe4052..636f2d4 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2897,22 +2897,6 @@ build_state (state_num s, struct dfa *d)
     d->trans[s] = trans;
 }
 
-static void
-build_state_zero (struct dfa *d)
-{
-  /* Initial size of the transition tables; must be positive.  */
-  int initial_tab_size = 1;
-
-  d->tralloc = 0;
-  d->trcount = 0;
-  d->trans = NULL;
-  d->fails = NULL;
-  d->success = NULL;
-  d->newlines = NULL;
-  realloc_trans_if_necessary (d, initial_tab_size);
-  build_state (0, d);
-}
-
 /* Multibyte character handling sub-routines for dfaexec.  */
 
 /* Return values of transit_state_singlebyte, and
@@ -3276,7 +3260,10 @@ dfaexec (struct dfa *d, char const *begin, char *end,
   size_t nlcount = 0;
 
   if (!d->tralloc)
-    build_state_zero (d);
+    {
+      realloc_trans_if_necessary (d, 0);
+      build_state (0, d);
+    }
 
   s = s1 = 0;
   p = mbp = (unsigned char const *) begin;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=268f80976577103d9bc9fe3006c05bf741060444


commit c32ff6730ce7fa6159f4bd3017b5e6b3c605461f
Author: Norihiro Tanaka <address@hidden>
Date:   Sat May 24 09:26:31 2014 +0900

    dfa: simplify building initial state
    
    build_state_zero doesn't need the struct dfa to be initialized,
    so remove the initialization and simplify.
    * src/dfa.c (build_state_zero): Remove.
    (dfaexec): Call realloc_trans_if_necessary and build_state directly.

diff --git a/src/dfa.c b/src/dfa.c
index dbe4052..636f2d4 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2897,22 +2897,6 @@ build_state (state_num s, struct dfa *d)
     d->trans[s] = trans;
 }
 
-static void
-build_state_zero (struct dfa *d)
-{
-  /* Initial size of the transition tables; must be positive.  */
-  int initial_tab_size = 1;
-
-  d->tralloc = 0;
-  d->trcount = 0;
-  d->trans = NULL;
-  d->fails = NULL;
-  d->success = NULL;
-  d->newlines = NULL;
-  realloc_trans_if_necessary (d, initial_tab_size);
-  build_state (0, d);
-}
-
 /* Multibyte character handling sub-routines for dfaexec.  */
 
 /* Return values of transit_state_singlebyte, and
@@ -3276,7 +3260,10 @@ dfaexec (struct dfa *d, char const *begin, char *end,
   size_t nlcount = 0;
 
   if (!d->tralloc)
-    build_state_zero (d);
+    {
+      realloc_trans_if_necessary (d, 0);
+      build_state (0, d);
+    }
 
   s = s1 = 0;
   p = mbp = (unsigned char const *) begin;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=95a8f7b46a0a3d0915ba3a619ea1659c8485e89d


commit c32ff6730ce7fa6159f4bd3017b5e6b3c605461f
Author: Norihiro Tanaka <address@hidden>
Date:   Sat May 24 09:26:31 2014 +0900

    dfa: simplify building initial state
    
    build_state_zero doesn't need the struct dfa to be initialized,
    so remove the initialization and simplify.
    * src/dfa.c (build_state_zero): Remove.
    (dfaexec): Call realloc_trans_if_necessary and build_state directly.

diff --git a/src/dfa.c b/src/dfa.c
index dbe4052..636f2d4 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2897,22 +2897,6 @@ build_state (state_num s, struct dfa *d)
     d->trans[s] = trans;
 }
 
-static void
-build_state_zero (struct dfa *d)
-{
-  /* Initial size of the transition tables; must be positive.  */
-  int initial_tab_size = 1;
-
-  d->tralloc = 0;
-  d->trcount = 0;
-  d->trans = NULL;
-  d->fails = NULL;
-  d->success = NULL;
-  d->newlines = NULL;
-  realloc_trans_if_necessary (d, initial_tab_size);
-  build_state (0, d);
-}
-
 /* Multibyte character handling sub-routines for dfaexec.  */
 
 /* Return values of transit_state_singlebyte, and
@@ -3276,7 +3260,10 @@ dfaexec (struct dfa *d, char const *begin, char *end,
   size_t nlcount = 0;
 
   if (!d->tralloc)
-    build_state_zero (d);
+    {
+      realloc_trans_if_necessary (d, 0);
+      build_state (0, d);
+    }
 
   s = s1 = 0;
   p = mbp = (unsigned char const *) begin;

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

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


hooks/post-receive
-- 
grep