diff options
| author | Karoly Lorentey | 2006-02-20 16:35:38 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-02-20 16:35:38 +0000 |
| commit | 0383bfd7963905724df93bed01ddeb3b7064222e (patch) | |
| tree | 0940dc85b5a7dc897e03dc0322c503386eeb8690 /src | |
| parent | f2aa3ae43bd451a6566f83ac5119b168d40891bc (diff) | |
| download | emacs-0383bfd7963905724df93bed01ddeb3b7064222e.tar.gz emacs-0383bfd7963905724df93bed01ddeb3b7064222e.zip | |
Fix compilation.
* src/regex.c (extend_range_table_work_area, regex_compile, fastmap):
Revert previous unnecessary changes.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-515
Diffstat (limited to 'src')
| -rw-r--r-- | src/regex.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/regex.c b/src/regex.c index c08471355fd..cd6301938a7 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -2067,10 +2067,10 @@ extend_range_table_work_area (work_area) | |||
| 2067 | work_area->allocated += 16 * sizeof (int); | 2067 | work_area->allocated += 16 * sizeof (int); |
| 2068 | if (work_area->table) | 2068 | if (work_area->table) |
| 2069 | work_area->table | 2069 | work_area->table |
| 2070 | = (int *) xrealloc (work_area->table, work_area->allocated); | 2070 | = (int *) realloc (work_area->table, work_area->allocated); |
| 2071 | else | 2071 | else |
| 2072 | work_area->table | 2072 | work_area->table |
| 2073 | = (int *) xmalloc (work_area->allocated); | 2073 | = (int *) malloc (work_area->allocated); |
| 2074 | } | 2074 | } |
| 2075 | 2075 | ||
| 2076 | #ifdef emacs | 2076 | #ifdef emacs |
| @@ -3608,11 +3608,11 @@ regex_compile (pattern, size, syntax, bufp) | |||
| 3608 | 3608 | ||
| 3609 | if (! fail_stack.stack) | 3609 | if (! fail_stack.stack) |
| 3610 | fail_stack.stack | 3610 | fail_stack.stack |
| 3611 | = (fail_stack_elt_t *) xmalloc (fail_stack.size | 3611 | = (fail_stack_elt_t *) malloc (fail_stack.size |
| 3612 | * sizeof (fail_stack_elt_t)); | 3612 | * sizeof (fail_stack_elt_t)); |
| 3613 | else | 3613 | else |
| 3614 | fail_stack.stack | 3614 | fail_stack.stack |
| 3615 | = (fail_stack_elt_t *) xrealloc (fail_stack.stack, | 3615 | = (fail_stack_elt_t *) realloc (fail_stack.stack, |
| 3616 | (fail_stack.size | 3616 | (fail_stack.size |
| 3617 | * sizeof (fail_stack_elt_t))); | 3617 | * sizeof (fail_stack_elt_t))); |
| 3618 | } | 3618 | } |
| @@ -6292,14 +6292,14 @@ regcomp (preg, pattern, cflags) | |||
| 6292 | preg->used = 0; | 6292 | preg->used = 0; |
| 6293 | 6293 | ||
| 6294 | /* Try to allocate space for the fastmap. */ | 6294 | /* Try to allocate space for the fastmap. */ |
| 6295 | preg->fastmap = (char *) xmalloc (1 << BYTEWIDTH); | 6295 | preg->fastmap = (char *) malloc (1 << BYTEWIDTH); |
| 6296 | 6296 | ||
| 6297 | if (cflags & REG_ICASE) | 6297 | if (cflags & REG_ICASE) |
| 6298 | { | 6298 | { |
| 6299 | unsigned i; | 6299 | unsigned i; |
| 6300 | 6300 | ||
| 6301 | preg->translate | 6301 | preg->translate |
| 6302 | = (RE_TRANSLATE_TYPE) xmalloc (CHAR_SET_SIZE | 6302 | = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE |
| 6303 | * sizeof (*(RE_TRANSLATE_TYPE)0)); | 6303 | * sizeof (*(RE_TRANSLATE_TYPE)0)); |
| 6304 | if (preg->translate == NULL) | 6304 | if (preg->translate == NULL) |
| 6305 | return (int) REG_ESPACE; | 6305 | return (int) REG_ESPACE; |