diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | regex_internal.h | 4 | ||||
| -rw-r--r-- | regexec.c | 4 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2016-01-22 Arnold D. Robbins <arnold@skeeve.com> + + * regexec.c (prune_impossible_nodes): Remove all attributes, on + both declaration and definition. Fixes a Linux Mint 17 compilation + braino reported by Antonio Colombo. + * regex_internal.h (test_malloc): Add cast to silence a warning + on the same system. + (test_realloc): Ditto. + 2016-01-20 Arnold D. Robbins <arnold@skeeve.com> * regex_internal.h [attribute_hidden]: Remove definition. diff --git a/regex_internal.h b/regex_internal.h index ff26be7b..28b4239e 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -471,7 +471,7 @@ test_malloc(size_t count, const char *file, size_t line) { if (count == 0) { fprintf(stderr, "%s:%lu: allocation of zero bytes\n", - file, line); + file, (unsigned long) line); exit(1); } return malloc(count); @@ -482,7 +482,7 @@ test_realloc(void *p, size_t count, const char *file, size_t line) { if (count == 0) { fprintf(stderr, "%s:%lu: reallocation of zero bytes\n", - file, line); + file, (unsigned long) line); exit(1); } return realloc(p, count); @@ -55,8 +55,7 @@ static int re_search_stub (struct re_pattern_buffer *bufp, int ret_len) internal_function; static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, int regs_allocated) internal_function; -static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx) - internal_function; +static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx); static int check_matching (re_match_context_t *mctx, int fl_longest_match, int *p_match_first) internal_function; static int check_halt_state_context (const re_match_context_t *mctx, @@ -963,7 +962,6 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch, } static reg_errcode_t -__attribute_warn_unused_result__ prune_impossible_nodes (re_match_context_t *mctx) { const re_dfa_t *const dfa = mctx->dfa; |