[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.21-62-g936c904
|
From: |
Paul Eggert |
|
Subject: |
grep branch, master, updated. v2.21-62-g936c904 |
|
Date: |
Wed, 12 Aug 2015 14:48:21 +0000 |
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 936c904a79285c42adbfc67c508b27d5717c2936 (commit)
via 5700656ed2ec6a93e0a5c825b445f639d21a0d6e (commit)
via c797046c7c13c2647182b919a79a4c5b4ecf82b1 (commit)
from 3ba6c9655a1c2465e6bd6e8453886eb579ee0eaa (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=936c904a79285c42adbfc67c508b27d5717c2936
commit 936c904a79285c42adbfc67c508b27d5717c2936
Author: Norihiro Tanaka <address@hidden>
Date: Wed Aug 12 07:35:03 2015 -0700
grep: remove fgrep code for case insensitive match
The fgrep matcher is no longer called in case insensitive matching,
so remove the code to support it.
* src/kwsearch.c (mb_case_map_apply): Remove function.
(Fexecute): Remove now-unused code.
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 04d1b6d..5a91eb6 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -37,14 +37,10 @@ void
Fcompile (char const *pattern, size_t size)
{
size_t total = size;
- mb_len_map_t *map = NULL;
- char const *pat = (match_icase && MB_CUR_MAX > 1
- ? mbtoupper (pattern, &total, &map)
- : pattern);
kwsinit (&kwset);
- char const *p = pat;
+ char const *p = pattern;
do
{
size_t len;
@@ -81,26 +77,6 @@ Fcompile (char const *pattern, size_t size)
kwsprep (kwset);
}
-/* Apply the MAP (created by mbtoupper) to the uppercase-buffer-relative
- *OFF and *LEN, converting them to be relative to the original buffer. */
-
-static void
-mb_case_map_apply (mb_len_map_t const *map, size_t *off, size_t *len)
-{
- if (map)
- {
- size_t off_incr = 0;
- size_t len_incr = 0;
- size_t k;
- for (k = 0; k < *off; k++)
- off_incr += map[k];
- for (; k < *off + *len; k++)
- len_incr += map[k];
- *off += off_incr;
- *len += len_incr;
- }
-}
-
size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
@@ -110,18 +86,6 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
char eol = eolbyte;
struct kwsmatch kwsmatch;
size_t ret_val;
- mb_len_map_t *map = NULL;
-
- if (MB_CUR_MAX > 1)
- {
- if (match_icase)
- {
- char *case_buf = mbtoupper (buf, &size, &map);
- if (start_ptr)
- start_ptr = case_buf + (start_ptr - buf);
- buf = case_buf;
- }
- }
for (mb_start = beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++)
{
@@ -194,7 +158,6 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
len = end - beg;
success_in_beg_and_len:;
size_t off = beg - buf;
- mb_case_map_apply (map, &off, &len);
*match_size = len;
ret_val = off;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=5700656ed2ec6a93e0a5c825b445f639d21a0d6e
commit 936c904a79285c42adbfc67c508b27d5717c2936
Author: Norihiro Tanaka <address@hidden>
Date: Wed Aug 12 07:35:03 2015 -0700
grep: remove fgrep code for case insensitive match
The fgrep matcher is no longer called in case insensitive matching,
so remove the code to support it.
* src/kwsearch.c (mb_case_map_apply): Remove function.
(Fexecute): Remove now-unused code.
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 04d1b6d..5a91eb6 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -37,14 +37,10 @@ void
Fcompile (char const *pattern, size_t size)
{
size_t total = size;
- mb_len_map_t *map = NULL;
- char const *pat = (match_icase && MB_CUR_MAX > 1
- ? mbtoupper (pattern, &total, &map)
- : pattern);
kwsinit (&kwset);
- char const *p = pat;
+ char const *p = pattern;
do
{
size_t len;
@@ -81,26 +77,6 @@ Fcompile (char const *pattern, size_t size)
kwsprep (kwset);
}
-/* Apply the MAP (created by mbtoupper) to the uppercase-buffer-relative
- *OFF and *LEN, converting them to be relative to the original buffer. */
-
-static void
-mb_case_map_apply (mb_len_map_t const *map, size_t *off, size_t *len)
-{
- if (map)
- {
- size_t off_incr = 0;
- size_t len_incr = 0;
- size_t k;
- for (k = 0; k < *off; k++)
- off_incr += map[k];
- for (; k < *off + *len; k++)
- len_incr += map[k];
- *off += off_incr;
- *len += len_incr;
- }
-}
-
size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
@@ -110,18 +86,6 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
char eol = eolbyte;
struct kwsmatch kwsmatch;
size_t ret_val;
- mb_len_map_t *map = NULL;
-
- if (MB_CUR_MAX > 1)
- {
- if (match_icase)
- {
- char *case_buf = mbtoupper (buf, &size, &map);
- if (start_ptr)
- start_ptr = case_buf + (start_ptr - buf);
- buf = case_buf;
- }
- }
for (mb_start = beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++)
{
@@ -194,7 +158,6 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
len = end - beg;
success_in_beg_and_len:;
size_t off = beg - buf;
- mb_case_map_apply (map, &off, &len);
*match_size = len;
ret_val = off;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c797046c7c13c2647182b919a79a4c5b4ecf82b1
commit 936c904a79285c42adbfc67c508b27d5717c2936
Author: Norihiro Tanaka <address@hidden>
Date: Wed Aug 12 07:35:03 2015 -0700
grep: remove fgrep code for case insensitive match
The fgrep matcher is no longer called in case insensitive matching,
so remove the code to support it.
* src/kwsearch.c (mb_case_map_apply): Remove function.
(Fexecute): Remove now-unused code.
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 04d1b6d..5a91eb6 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -37,14 +37,10 @@ void
Fcompile (char const *pattern, size_t size)
{
size_t total = size;
- mb_len_map_t *map = NULL;
- char const *pat = (match_icase && MB_CUR_MAX > 1
- ? mbtoupper (pattern, &total, &map)
- : pattern);
kwsinit (&kwset);
- char const *p = pat;
+ char const *p = pattern;
do
{
size_t len;
@@ -81,26 +77,6 @@ Fcompile (char const *pattern, size_t size)
kwsprep (kwset);
}
-/* Apply the MAP (created by mbtoupper) to the uppercase-buffer-relative
- *OFF and *LEN, converting them to be relative to the original buffer. */
-
-static void
-mb_case_map_apply (mb_len_map_t const *map, size_t *off, size_t *len)
-{
- if (map)
- {
- size_t off_incr = 0;
- size_t len_incr = 0;
- size_t k;
- for (k = 0; k < *off; k++)
- off_incr += map[k];
- for (; k < *off + *len; k++)
- len_incr += map[k];
- *off += off_incr;
- *len += len_incr;
- }
-}
-
size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
@@ -110,18 +86,6 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
char eol = eolbyte;
struct kwsmatch kwsmatch;
size_t ret_val;
- mb_len_map_t *map = NULL;
-
- if (MB_CUR_MAX > 1)
- {
- if (match_icase)
- {
- char *case_buf = mbtoupper (buf, &size, &map);
- if (start_ptr)
- start_ptr = case_buf + (start_ptr - buf);
- buf = case_buf;
- }
- }
for (mb_start = beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++)
{
@@ -194,7 +158,6 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
len = end - beg;
success_in_beg_and_len:;
size_t off = beg - buf;
- mb_case_map_apply (map, &off, &len);
*match_size = len;
ret_val = off;
-----------------------------------------------------------------------
Summary of changes:
src/dfa.c | 261 +++++++++++---------------------------------------------
src/kwsearch.c | 39 +--------
2 files changed, 51 insertions(+), 249 deletions(-)
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.21-62-g936c904,
Paul Eggert <=