[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.25-57-g4ebf587
|
From: |
Jim Meyering |
|
Subject: |
grep branch, master, updated. v2.25-57-g4ebf587 |
|
Date: |
Sun, 21 Aug 2016 00:42:06 +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 4ebf587adc23057921c5e26df8c34ffe2cf91c9d (commit)
via e0a4b399ad3e4da1a03a1c2c51eb8134d1fce1de (commit)
via 8cf06f05c154e669359cf940ed13d73f6a19562b (commit)
via 47a8f357a58b0bd1ff400b0d88f633807176bcf2 (commit)
via ef1e79875747dbf600933921baefdcf03bf2ac17 (commit)
from 0c85b9f1cc1acf386ae921452225a77e68834243 (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=4ebf587adc23057921c5e26df8c34ffe2cf91c9d
commit 4ebf587adc23057921c5e26df8c34ffe2cf91c9d
Author: Zev Weiss <address@hidden>
Date: Thu Aug 18 05:50:19 2016 -0500
dfa: thread-safety: initialize mbrtowc_cache in dfa_init
* src/dfa.c (dfasyntax): Remove initialization of mbrtowc_cache.
(init_mbrtowc_cache): New function.
(dfa_init): Call it.
http://bugs.gnu.org/24259
diff --git a/src/dfa.c b/src/dfa.c
index 86dab0d..33b3cd0 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -767,6 +767,20 @@ dfa_using_utf8 (void)
return using_utf8;
}
+static void
+init_mbrtowc_cache (void)
+{
+ int i;
+ for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
+ {
+ char c = i;
+ unsigned char uc = i;
+ mbstate_t s = { 0 };
+ wchar_t wc;
+ mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
+ }
+}
+
/* Entry point to set syntax options. */
void
dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold, unsigned char eol)
@@ -779,13 +793,9 @@ dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold,
unsigned char eol)
for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
{
- char c = i;
unsigned char uc = i;
- mbstate_t s = { 0 };
- wchar_t wc;
- mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
- /* Now that mbrtowc_cache[uc] is set, use it to calculate sbit. */
+ /* Use mbrtowc_cache to calculate sbit. */
dfa->syntax.sbit[uc] = char_context (dfa, uc);
switch (dfa->syntax.sbit[uc])
{
@@ -4204,6 +4214,7 @@ dfa_init (void)
{
check_utf8 ();
check_unibyte_c ();
+ init_mbrtowc_cache ();
}
/* vim:set shiftwidth=2: */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=e0a4b399ad3e4da1a03a1c2c51eb8134d1fce1de
commit 4ebf587adc23057921c5e26df8c34ffe2cf91c9d
Author: Zev Weiss <address@hidden>
Date: Thu Aug 18 05:50:19 2016 -0500
dfa: thread-safety: initialize mbrtowc_cache in dfa_init
* src/dfa.c (dfasyntax): Remove initialization of mbrtowc_cache.
(init_mbrtowc_cache): New function.
(dfa_init): Call it.
http://bugs.gnu.org/24259
diff --git a/src/dfa.c b/src/dfa.c
index 86dab0d..33b3cd0 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -767,6 +767,20 @@ dfa_using_utf8 (void)
return using_utf8;
}
+static void
+init_mbrtowc_cache (void)
+{
+ int i;
+ for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
+ {
+ char c = i;
+ unsigned char uc = i;
+ mbstate_t s = { 0 };
+ wchar_t wc;
+ mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
+ }
+}
+
/* Entry point to set syntax options. */
void
dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold, unsigned char eol)
@@ -779,13 +793,9 @@ dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold,
unsigned char eol)
for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
{
- char c = i;
unsigned char uc = i;
- mbstate_t s = { 0 };
- wchar_t wc;
- mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
- /* Now that mbrtowc_cache[uc] is set, use it to calculate sbit. */
+ /* Use mbrtowc_cache to calculate sbit. */
dfa->syntax.sbit[uc] = char_context (dfa, uc);
switch (dfa->syntax.sbit[uc])
{
@@ -4204,6 +4214,7 @@ dfa_init (void)
{
check_utf8 ();
check_unibyte_c ();
+ init_mbrtowc_cache ();
}
/* vim:set shiftwidth=2: */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=8cf06f05c154e669359cf940ed13d73f6a19562b
commit 4ebf587adc23057921c5e26df8c34ffe2cf91c9d
Author: Zev Weiss <address@hidden>
Date: Thu Aug 18 05:50:19 2016 -0500
dfa: thread-safety: initialize mbrtowc_cache in dfa_init
* src/dfa.c (dfasyntax): Remove initialization of mbrtowc_cache.
(init_mbrtowc_cache): New function.
(dfa_init): Call it.
http://bugs.gnu.org/24259
diff --git a/src/dfa.c b/src/dfa.c
index 86dab0d..33b3cd0 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -767,6 +767,20 @@ dfa_using_utf8 (void)
return using_utf8;
}
+static void
+init_mbrtowc_cache (void)
+{
+ int i;
+ for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
+ {
+ char c = i;
+ unsigned char uc = i;
+ mbstate_t s = { 0 };
+ wchar_t wc;
+ mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
+ }
+}
+
/* Entry point to set syntax options. */
void
dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold, unsigned char eol)
@@ -779,13 +793,9 @@ dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold,
unsigned char eol)
for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
{
- char c = i;
unsigned char uc = i;
- mbstate_t s = { 0 };
- wchar_t wc;
- mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
- /* Now that mbrtowc_cache[uc] is set, use it to calculate sbit. */
+ /* Use mbrtowc_cache to calculate sbit. */
dfa->syntax.sbit[uc] = char_context (dfa, uc);
switch (dfa->syntax.sbit[uc])
{
@@ -4204,6 +4214,7 @@ dfa_init (void)
{
check_utf8 ();
check_unibyte_c ();
+ init_mbrtowc_cache ();
}
/* vim:set shiftwidth=2: */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=47a8f357a58b0bd1ff400b0d88f633807176bcf2
commit 4ebf587adc23057921c5e26df8c34ffe2cf91c9d
Author: Zev Weiss <address@hidden>
Date: Thu Aug 18 05:50:19 2016 -0500
dfa: thread-safety: initialize mbrtowc_cache in dfa_init
* src/dfa.c (dfasyntax): Remove initialization of mbrtowc_cache.
(init_mbrtowc_cache): New function.
(dfa_init): Call it.
http://bugs.gnu.org/24259
diff --git a/src/dfa.c b/src/dfa.c
index 86dab0d..33b3cd0 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -767,6 +767,20 @@ dfa_using_utf8 (void)
return using_utf8;
}
+static void
+init_mbrtowc_cache (void)
+{
+ int i;
+ for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
+ {
+ char c = i;
+ unsigned char uc = i;
+ mbstate_t s = { 0 };
+ wchar_t wc;
+ mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
+ }
+}
+
/* Entry point to set syntax options. */
void
dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold, unsigned char eol)
@@ -779,13 +793,9 @@ dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold,
unsigned char eol)
for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
{
- char c = i;
unsigned char uc = i;
- mbstate_t s = { 0 };
- wchar_t wc;
- mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
- /* Now that mbrtowc_cache[uc] is set, use it to calculate sbit. */
+ /* Use mbrtowc_cache to calculate sbit. */
dfa->syntax.sbit[uc] = char_context (dfa, uc);
switch (dfa->syntax.sbit[uc])
{
@@ -4204,6 +4214,7 @@ dfa_init (void)
{
check_utf8 ();
check_unibyte_c ();
+ init_mbrtowc_cache ();
}
/* vim:set shiftwidth=2: */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ef1e79875747dbf600933921baefdcf03bf2ac17
commit 4ebf587adc23057921c5e26df8c34ffe2cf91c9d
Author: Zev Weiss <address@hidden>
Date: Thu Aug 18 05:50:19 2016 -0500
dfa: thread-safety: initialize mbrtowc_cache in dfa_init
* src/dfa.c (dfasyntax): Remove initialization of mbrtowc_cache.
(init_mbrtowc_cache): New function.
(dfa_init): Call it.
http://bugs.gnu.org/24259
diff --git a/src/dfa.c b/src/dfa.c
index 86dab0d..33b3cd0 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -767,6 +767,20 @@ dfa_using_utf8 (void)
return using_utf8;
}
+static void
+init_mbrtowc_cache (void)
+{
+ int i;
+ for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
+ {
+ char c = i;
+ unsigned char uc = i;
+ mbstate_t s = { 0 };
+ wchar_t wc;
+ mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
+ }
+}
+
/* Entry point to set syntax options. */
void
dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold, unsigned char eol)
@@ -779,13 +793,9 @@ dfasyntax (struct dfa *dfa, reg_syntax_t bits, bool fold,
unsigned char eol)
for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
{
- char c = i;
unsigned char uc = i;
- mbstate_t s = { 0 };
- wchar_t wc;
- mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
- /* Now that mbrtowc_cache[uc] is set, use it to calculate sbit. */
+ /* Use mbrtowc_cache to calculate sbit. */
dfa->syntax.sbit[uc] = char_context (dfa, uc);
switch (dfa->syntax.sbit[uc])
{
@@ -4204,6 +4214,7 @@ dfa_init (void)
{
check_utf8 ();
check_unibyte_c ();
+ init_mbrtowc_cache ();
}
/* vim:set shiftwidth=2: */
-----------------------------------------------------------------------
Summary of changes:
src/dfa.c | 694 +++++++++++++++++++++++++++----------------------
src/dfa.h | 13 +-
src/dfasearch.c | 7 +-
src/grep.c | 2 +
src/kwsearch.c | 2 +-
src/pcresearch.c | 2 +-
tests/dfa-match-aux.c | 4 +-
7 files changed, 396 insertions(+), 328 deletions(-)
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.25-57-g4ebf587,
Jim Meyering <=