grep branch, master, updated. v2.16-11-g5a1357c

[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  5a1357c9909a79fb3a15218446dca052680ef525 (commit)
       via  3e64071cce24398133e6f9989225b4dbe58b6c97 (commit)
       via  f804d7afbf75f08fd209ad08358bf76c18cc1d56 (commit)
      from  a46b95cb3f5a1b6e399a48cc0f554c1df1371b21 (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=5a1357c9909a79fb3a15218446dca052680ef525


commit 5a1357c9909a79fb3a15218446dca052680ef525
Author: Jim Meyering <address@hidden>
Date:   Sat Jan 25 16:47:17 2014 -0800

    maint: move two local variable declarations
    
    * src/dfasearch.c (kwsmusts): Move one declaration down to the point
    of definition.  Move another into the sole scope where it is used.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 69856a8..37b6acb 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -81,18 +81,16 @@ dfawarn (char const *mesg)
 static void
 kwsmusts (void)
 {
-  struct dfamust const *dm;
-  char const *err;
-
   /* With case-insensitive matching in a multi-byte locale, do not
      use kwsearch, because in that case, it would be too expensive,
      requiring that we case-convert all searched input.  */
   if (MB_CUR_MAX > 1 && match_icase)
     return;
 
-  dm = dfamusts (dfa);
+  struct dfamust const *dm = dfamusts (dfa);
   if (dm)
     {
+      char const *err;
       kwsinit (&kwset);
       /* First, we compile in the substrings known to be exact
          matches.  The kwset matcher will return the index

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3e64071cce24398133e6f9989225b4dbe58b6c97


commit 5a1357c9909a79fb3a15218446dca052680ef525
Author: Jim Meyering <address@hidden>
Date:   Sat Jan 25 16:47:17 2014 -0800

    maint: move two local variable declarations
    
    * src/dfasearch.c (kwsmusts): Move one declaration down to the point
    of definition.  Move another into the sole scope where it is used.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 69856a8..37b6acb 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -81,18 +81,16 @@ dfawarn (char const *mesg)
 static void
 kwsmusts (void)
 {
-  struct dfamust const *dm;
-  char const *err;
-
   /* With case-insensitive matching in a multi-byte locale, do not
      use kwsearch, because in that case, it would be too expensive,
      requiring that we case-convert all searched input.  */
   if (MB_CUR_MAX > 1 && match_icase)
     return;
 
-  dm = dfamusts (dfa);
+  struct dfamust const *dm = dfamusts (dfa);
   if (dm)
     {
+      char const *err;
       kwsinit (&kwset);
       /* First, we compile in the substrings known to be exact
          matches.  The kwset matcher will return the index

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


commit 5a1357c9909a79fb3a15218446dca052680ef525
Author: Jim Meyering <address@hidden>
Date:   Sat Jan 25 16:47:17 2014 -0800

    maint: move two local variable declarations
    
    * src/dfasearch.c (kwsmusts): Move one declaration down to the point
    of definition.  Move another into the sole scope where it is used.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 69856a8..37b6acb 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -81,18 +81,16 @@ dfawarn (char const *mesg)
 static void
 kwsmusts (void)
 {
-  struct dfamust const *dm;
-  char const *err;
-
   /* With case-insensitive matching in a multi-byte locale, do not
      use kwsearch, because in that case, it would be too expensive,
      requiring that we case-convert all searched input.  */
   if (MB_CUR_MAX > 1 && match_icase)
     return;
 
-  dm = dfamusts (dfa);
+  struct dfamust const *dm = dfamusts (dfa);
   if (dm)
     {
+      char const *err;
       kwsinit (&kwset);
       /* First, we compile in the substrings known to be exact
          matches.  The kwset matcher will return the index

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

Summary of changes:
 src/dfa.c          |    8 -------
 src/dfasearch.c    |   55 +++++++++++++++------------------------------------
 tests/turkish-eyes |    6 +++-
 3 files changed, 20 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
grep