grep branch, master, updated. v3.6-31-g2192cab

[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  2192cabb7adae528ebc411cd479cdc74804abd14 (commit)
       via  84a183ef2eadf48735a9319773b990f30e2fd575 (commit)
       via  dadc9f49c08c98910ccd208e6fea573304aa8ca2 (commit)
      from  5c628c7074ae4a90a62165502afe5e7cb6a7eaa5 (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=2192cabb7adae528ebc411cd479cdc74804abd14


commit 2192cabb7adae528ebc411cd479cdc74804abd14
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Mon Jul 5 14:48:59 2021 -0700

    grep: simplify EGexecute
    
    * src/dfasearch.c (EGexecute): Remove a label and goto.
    This also makes the machine code a bit shorter, on x86-64 gcc.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index ef52218..d6afa8d 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -376,7 +376,7 @@ EGexecute (void *vdc, char const *buf, size_t size, size_t 
*match_size,
                                           buflim - beg + dc->begline,
                                           &kwsm, true);
               if (offset < 0)
-                goto failure;
+                return offset;
               match = beg + offset;
               prev_beg = beg;
 
@@ -579,7 +579,6 @@ EGexecute (void *vdc, char const *buf, size_t size, size_t 
*match_size,
           }
     } /* for (beg = end ..) */
 
- failure:
   return -1;
 
  success:

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


commit 2192cabb7adae528ebc411cd479cdc74804abd14
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Mon Jul 5 14:48:59 2021 -0700

    grep: simplify EGexecute
    
    * src/dfasearch.c (EGexecute): Remove a label and goto.
    This also makes the machine code a bit shorter, on x86-64 gcc.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index ef52218..d6afa8d 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -376,7 +376,7 @@ EGexecute (void *vdc, char const *buf, size_t size, size_t 
*match_size,
                                           buflim - beg + dc->begline,
                                           &kwsm, true);
               if (offset < 0)
-                goto failure;
+                return offset;
               match = beg + offset;
               prev_beg = beg;
 
@@ -579,7 +579,6 @@ EGexecute (void *vdc, char const *buf, size_t size, size_t 
*match_size,
           }
     } /* for (beg = end ..) */
 
- failure:
   return -1;
 
  success:

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


commit 2192cabb7adae528ebc411cd479cdc74804abd14
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Mon Jul 5 14:48:59 2021 -0700

    grep: simplify EGexecute
    
    * src/dfasearch.c (EGexecute): Remove a label and goto.
    This also makes the machine code a bit shorter, on x86-64 gcc.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index ef52218..d6afa8d 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -376,7 +376,7 @@ EGexecute (void *vdc, char const *buf, size_t size, size_t 
*match_size,
                                           buflim - beg + dc->begline,
                                           &kwsm, true);
               if (offset < 0)
-                goto failure;
+                return offset;
               match = beg + offset;
               prev_beg = beg;
 
@@ -579,7 +579,6 @@ EGexecute (void *vdc, char const *buf, size_t size, size_t 
*match_size,
           }
     } /* for (beg = end ..) */
 
- failure:
   return -1;
 
  success:

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

Summary of changes:
 src/dfasearch.c |  3 +--
 src/grep.c      | 20 +++++++-------------
 2 files changed, 8 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
grep