Commit a073faa6 authored by Chong Yidong's avatar Chong Yidong
Browse files

* regex.c: Revert 2006-02-19 change.

	Redefine malloc -> xmalloc, realloc -> xrealloc as in Emacs case.
parent a77f947b
2006-02-20 Chong Yidong <cyd@stupidchicken.com>
 
* regex.c (xmalloc, xrealloc): Define these when not linked to
Emacs.
* regex.c: Revert 2006-02-19 change.
(xmalloc, xrealloc): Define these when not linked to Emacs.
Redefine malloc -> xmalloc, realloc -> xrealloc as in Emacs case.
 
2006-02-19 Luc Teirlinck <teirllm@auburn.edu>
 
......
......@@ -217,6 +217,15 @@ xrealloc (block, size)
return val;
}
# ifdef malloc
# undef malloc
# endif
# define malloc xmalloc
# ifdef realloc
# undef realloc
# endif
# define realloc xrealloc
/* When used in Emacs's lib-src, we need to get bzero and bcopy somehow.
If nothing else has been done, use the method below. */
# ifdef INHIBIT_STRING_HEADER
......@@ -2103,10 +2112,10 @@ extend_range_table_work_area (work_area)
work_area->allocated += 16 * sizeof (int);
if (work_area->table)
work_area->table
= (int *) xrealloc (work_area->table, work_area->allocated);
= (int *) realloc (work_area->table, work_area->allocated);
else
work_area->table
= (int *) xmalloc (work_area->allocated);
= (int *) malloc (work_area->allocated);
}
#ifdef emacs
......@@ -3644,11 +3653,11 @@ regex_compile (pattern, size, syntax, bufp)
if (! fail_stack.stack)
fail_stack.stack
= (fail_stack_elt_t *) xmalloc (fail_stack.size
= (fail_stack_elt_t *) malloc (fail_stack.size
* sizeof (fail_stack_elt_t));
else
fail_stack.stack
= (fail_stack_elt_t *) xrealloc (fail_stack.stack,
= (fail_stack_elt_t *) realloc (fail_stack.stack,
(fail_stack.size
* sizeof (fail_stack_elt_t)));
}
......@@ -6328,14 +6337,14 @@ regcomp (preg, pattern, cflags)
preg->used = 0;
/* Try to allocate space for the fastmap. */
preg->fastmap = (char *) xmalloc (1 << BYTEWIDTH);
preg->fastmap = (char *) malloc (1 << BYTEWIDTH);
if (cflags & REG_ICASE)
{
unsigned i;
preg->translate
= (RE_TRANSLATE_TYPE) xmalloc (CHAR_SET_SIZE
= (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE
* sizeof (*(RE_TRANSLATE_TYPE)0));
if (preg->translate == NULL)
return (int) REG_ESPACE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment