[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a0d1e4c 8/8: * src/regex.c (re_search_2): Use UNINI
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master a0d1e4c 8/8: * src/regex.c (re_search_2): Use UNINIT, not IF_LINT. |
Date: |
Sun, 23 Oct 2016 09:58:40 +0000 (UTC) |
branch: master
commit a0d1e4c66296f76635f405427f55dbcc62a4fd68
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
* src/regex.c (re_search_2): Use UNINIT, not IF_LINT.
This finishes the merge of the recent emacs-25 regex changes into
master.
---
src/regex.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/regex.c b/src/regex.c
index 8bc8303..8d769cc 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -4346,7 +4346,8 @@ re_search_2 (struct re_pattern_buffer *bufp, const char
*str1, size_t size1,
/* Loop through the string, looking for a place to start matching. */
for (;;)
{
- ptrdiff_t offset1, offset2;
+ ptrdiff_t offset1;
+ ptrdiff_t offset2 UNINIT; /* The UNINIT works around GCC bug 78081. */
re_char *orig_base;
bool might_relocate;
@@ -4468,7 +4469,6 @@ re_search_2 (struct re_pattern_buffer *bufp, const char
*str1, size_t size1,
/* re_match_2_internal may allocate, relocating the Lisp text
object that we're searching. */
- IF_LINT (offset2 = 0); /* Work around GCC bug 78081. */
orig_base = STR_BASE_PTR (re_match_object);
might_relocate = orig_base != NULL;
if (might_relocate)
- [Emacs-diffs] master updated (241ae7a -> a0d1e4c), Paul Eggert, 2016/10/23
- [Emacs-diffs] master 16d126d 2/8: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/23
- [Emacs-diffs] master f39141b 1/8: Merge from origin/emacs-25, Paul Eggert, 2016/10/23
- [Emacs-diffs] master 46288dd 6/8: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/23
- [Emacs-diffs] master e892e11 4/8: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/23
- [Emacs-diffs] master a0d1e4c 8/8: * src/regex.c (re_search_2): Use UNINIT, not IF_LINT.,
Paul Eggert <=
- [Emacs-diffs] master 6129cd0 3/8: Merge from origin/emacs-25, Paul Eggert, 2016/10/23
- [Emacs-diffs] master 394bdb8 7/8: Merge from origin/emacs-25, Paul Eggert, 2016/10/23
- [Emacs-diffs] master 6df147c 5/8: Merge from origin/emacs-25, Paul Eggert, 2016/10/23