diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:58:07 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:58:31 -0700 |
| commit | a0d1e4c66296f76635f405427f55dbcc62a4fd68 (patch) | |
| tree | 3b2a55fe5be69064ed542155108034a19ba37566 | |
| parent | 394bdb8f2317e312d39e071b588581802dd3027a (diff) | |
| download | emacs-a0d1e4c66296f76635f405427f55dbcc62a4fd68.tar.gz | |
* src/regex.c (re_search_2): Use UNINIT, not IF_LINT.
This finishes the merge of the recent emacs-25 regex changes into
master.
| -rw-r--r-- | src/regex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/regex.c b/src/regex.c index 8bc830356d0..8d769cc6c82 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) |