[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

grep branch, master, updated. v2.27-27-g1d5679e

From: Paul Eggert
Subject: grep branch, master, updated. v2.27-27-g1d5679e
Date: Sun, 25 Dec 2016 23:24:00 +0000 (UTC)

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  1d5679ea305370430538e9c1284db736c8433503 (commit)
      from  31a5e0f4f7c365bbad1436f97e684254886f42a3 (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 -----------------------------------------------------------------

commit 1d5679ea305370430538e9c1284db736c8433503
Author: Zev Weiss <address@hidden>
Date:   Sun Dec 25 04:56:06 2016 -0600

    grep: move localeinfo to grep.c
    It's not really dfasearch-specific, and grep.c initializes it, so it
    seems like the most appropriate "owner".
    * src/dfasearch.c (localeinfo): Remove.
    * src/grep.c (localeinfo): Add.
    * src/search.h (localeinfo): Move to new commented section.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 0abe7f6..c201a51 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -24,8 +24,6 @@
 #include "die.h"
 #include <error.h>
-struct localeinfo localeinfo;
 struct dfa_comp
   /* KWset compiled pattern.  For Ecompile and Gcompile, we compile
diff --git a/src/grep.c b/src/grep.c
index 9a89b5e..f28f3c2 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -625,6 +625,8 @@ clean_up_stdout (void)
 /* An unsigned type suitable for fast matching.  */
 typedef uintmax_t uword;
+struct localeinfo localeinfo;
 /* A mask to test for unibyte characters, with the pattern repeated to
    fill a uword.  For a multibyte character encoding where
    all bytes are unibyte characters, this is 0.  For UTF-8, this is
diff --git a/src/search.h b/src/search.h
index 766b1f6..469fc9c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -54,7 +54,6 @@ extern size_t wordchar_prev (char const *, char const *, char 
const *);
 extern ptrdiff_t mb_goback (char const **, char const *, char const *);
 /* dfasearch.c */
-extern struct localeinfo localeinfo;
 extern void *GEAcompile (char const *, size_t, reg_syntax_t);
 extern size_t EGexecute (void *, char const *, size_t, size_t *, char const *);
@@ -66,6 +65,9 @@ extern size_t Fexecute (void *, char const *, size_t, size_t 
*, char const *);
 extern void *Pcompile (char const *, size_t, reg_syntax_t);
 extern size_t Pexecute (void *, char const *, size_t, size_t *, char const *);
+/* grep.c */
+extern struct localeinfo localeinfo;
 /* Return the number of bytes in the character at the start of S, which
    is of size N.  N must be positive.  MBS is the conversion state.
    This acts like mbrlen, except it returns 1 when mbrlen would return 0,


Summary of changes:
 src/dfasearch.c |    2 --
 src/grep.c      |    2 ++
 src/search.h    |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]