diff options
| -rw-r--r-- | support/ChangeLog | 14 | ||||
| -rw-r--r-- | support/regcomp.c | 4 | ||||
| -rw-r--r-- | support/regex_internal.h | 3 | ||||
| -rw-r--r-- | support/regexec.c | 4 |
4 files changed, 19 insertions, 6 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index d580505f..9db50d33 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,17 @@ +2017-12-19 Paul Eggert <eggert@cs.ucla.edu> + + Small sync with gnulib based on mails in libc-alpha@sourceware.com. + + Use re_malloc etc. consistently. + + * regcomp.c (re_comp, analyze): Use re_malloc/re_free instead of + malloc/free. + * regexec.c (push_fail_stack): Use re_realloc instead of realloc. + + Other changes: + + * regex_internal.h: Synchronize on __libc_lock_define usage. + 2017-12-05 Arnold D. Robbins <arnold@skeeve.com> * regex.h: Yes define __USE_GNU. Needed for non-GLIBC systems. diff --git a/support/regcomp.c b/support/regcomp.c index 4fca1108..0d0cbf69 100644 --- a/support/regcomp.c +++ b/support/regcomp.c @@ -715,7 +715,7 @@ re_comp (const char *s) if (re_comp_buf.fastmap == NULL) { - re_comp_buf.fastmap = (char *) malloc (SBC_MAX); + re_comp_buf.fastmap = (char *) re_malloc (SBC_MAX); if (re_comp_buf.fastmap == NULL) return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) REG_ESPACE]); @@ -1217,7 +1217,7 @@ analyze (regex_t *preg) break; if (i == preg->re_nsub) { - free (dfa->subexp_map); + re_free (dfa->subexp_map); dfa->subexp_map = NULL; } } diff --git a/support/regex_internal.h b/support/regex_internal.h index dbcf9a32..f97ecbe2 100644 --- a/support/regex_internal.h +++ b/support/regex_internal.h @@ -47,7 +47,6 @@ #if defined _LIBC # include <libc-lock.h> #else -# define __libc_lock_define(CLASS,NAME) # define __libc_lock_init(NAME) do { } while (0) # define __libc_lock_lock(NAME) do { } while (0) # define __libc_lock_unlock(NAME) do { } while (0) @@ -700,7 +699,7 @@ struct re_dfa_t #ifdef DEBUG char* re_str; #endif -#if defined _LIBC +#ifdef _LIBC __libc_lock_define (, lock) #endif }; diff --git a/support/regexec.c b/support/regexec.c index 05deab00..0587ad24 100644 --- a/support/regexec.c +++ b/support/regexec.c @@ -1327,8 +1327,8 @@ push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node, if (fs->num == fs->alloc) { struct re_fail_stack_ent_t *new_array; - new_array = realloc (fs->stack, (sizeof (struct re_fail_stack_ent_t) - * fs->alloc * 2)); + new_array = re_realloc (fs->stack, struct re_fail_stack_ent_t, + fs->alloc * 2); if (new_array == NULL) return REG_ESPACE; fs->alloc *= 2; |