grep branch, master, updated. v2.18-79-g03aeb1c

[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  03aeb1cca6bab2577666a3ce63ffe4437755af38 (commit)
       via  42b14d981975f50ca949ffbc234fb798816ec22e (commit)
      from  28f6eed8db830ec2a92a560ef25cc93c6361b12c (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=03aeb1cca6bab2577666a3ce63ffe4437755af38


commit 03aeb1cca6bab2577666a3ce63ffe4437755af38
Author: Paul Eggert <address@hidden>
Date:   Thu Apr 17 23:26:49 2014 -0700

    dfa: minor cleanup
    
    * src/dfa.c (MAX): Remove; no longer used.

diff --git a/src/dfa.c b/src/dfa.c
index c53d109..eeca257 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -868,9 +868,6 @@ static wchar_t wctok;           /* Wide character 
representation of the current
 #ifndef MIN
 # define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
-#ifndef MAX
-# define MAX(a,b) ((a) < (b) ? (b) : (a))
-#endif
 
 /* The set of wchar_t values C such that there's a useful locale
    somewhere where C != towupper (C) && C != towlower (towupper (C)).
@@ -3103,9 +3100,9 @@ transit_state_consume_1char (struct dfa *d, state_num s,
   state_num s1, s2;
   status_transit_state rs = TRANSIT_STATE_DONE;
 
-  /* Check (input) match_lens, and initialize if it is NULL.  */
-  if (match_lens == NULL && d->states[s].mbps.nelem != 0)
-    match_lens = check_matching_with_multibyte_ops (d, s, (char const *) *pp, 
wc, mbclen);
+  if (! match_lens && d->states[s].mbps.nelem != 0)
+    match_lens = check_matching_with_multibyte_ops (d, s, (char const *) *pp,
+                                                    wc, mbclen);
 
   /* Calculate the state which can be reached from the state 's' by
      consuming 'mbclen' single bytes from the buffer.  */
@@ -3155,7 +3152,8 @@ transit_state (struct dfa *d, state_num s, unsigned char 
const **pp,
     {
       /* Note: caller must free the return value of this function.  */
       mbclen = mbs_to_wchar (d, &wc, (char const *) *pp, end - *pp, &mbs);
-      match_lens = check_matching_with_multibyte_ops (d, s, (char const *) 
*pp, wc, mbclen);
+      match_lens = check_matching_with_multibyte_ops (d, s, (char const *) *pp,
+                                                      wc, mbclen);
 
       for (i = 0; i < nelem; i++)
         /* Search the operator which match the longest string,

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=42b14d981975f50ca949ffbc234fb798816ec22e


commit 03aeb1cca6bab2577666a3ce63ffe4437755af38
Author: Paul Eggert <address@hidden>
Date:   Thu Apr 17 23:26:49 2014 -0700

    dfa: minor cleanup
    
    * src/dfa.c (MAX): Remove; no longer used.

diff --git a/src/dfa.c b/src/dfa.c
index c53d109..eeca257 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -868,9 +868,6 @@ static wchar_t wctok;           /* Wide character 
representation of the current
 #ifndef MIN
 # define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
-#ifndef MAX
-# define MAX(a,b) ((a) < (b) ? (b) : (a))
-#endif
 
 /* The set of wchar_t values C such that there's a useful locale
    somewhere where C != towupper (C) && C != towlower (towupper (C)).
@@ -3103,9 +3100,9 @@ transit_state_consume_1char (struct dfa *d, state_num s,
   state_num s1, s2;
   status_transit_state rs = TRANSIT_STATE_DONE;
 
-  /* Check (input) match_lens, and initialize if it is NULL.  */
-  if (match_lens == NULL && d->states[s].mbps.nelem != 0)
-    match_lens = check_matching_with_multibyte_ops (d, s, (char const *) *pp, 
wc, mbclen);
+  if (! match_lens && d->states[s].mbps.nelem != 0)
+    match_lens = check_matching_with_multibyte_ops (d, s, (char const *) *pp,
+                                                    wc, mbclen);
 
   /* Calculate the state which can be reached from the state 's' by
      consuming 'mbclen' single bytes from the buffer.  */
@@ -3155,7 +3152,8 @@ transit_state (struct dfa *d, state_num s, unsigned char 
const **pp,
     {
       /* Note: caller must free the return value of this function.  */
       mbclen = mbs_to_wchar (d, &wc, (char const *) *pp, end - *pp, &mbs);
-      match_lens = check_matching_with_multibyte_ops (d, s, (char const *) 
*pp, wc, mbclen);
+      match_lens = check_matching_with_multibyte_ops (d, s, (char const *) *pp,
+                                                      wc, mbclen);
 
       for (i = 0; i < nelem; i++)
         /* Search the operator which match the longest string,

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

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


hooks/post-receive
-- 
grep