comparison src/regex.c @ 83475:88cd30b5064d

Fix compilation. * src/regex.c (extend_range_table_work_area, regex_compile, fastmap): Revert previous unnecessary changes. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-515

83474:d08a7ef0cb8a

     struct 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);
  else
    work_area->table
      = (int *) xmalloc (work_area->allocated);
}

#ifdef emacs

/* Carefully find the ranges of codes that are equivalent

      {
	fail_stack.size = re_max_failures * TYPICAL_FAILURE_SIZE;

	if (! fail_stack.stack)
	  fail_stack.stack
	    = (fail_stack_elt_t *) xmalloc (fail_stack.size
					    * sizeof (fail_stack_elt_t));
	else
	  fail_stack.stack
	    = (fail_stack_elt_t *) xrealloc (fail_stack.stack,
					     (fail_stack.size
					      * sizeof (fail_stack_elt_t)));
      }

    regex_grow_registers (num_regs);

  preg->buffer = 0;
  preg->allocated = 0;
  preg->used = 0;

  /* Try to allocate space for the fastmap.  */
  preg->fastmap = (char *) xmalloc (1 << BYTEWIDTH);

  if (cflags & REG_ICASE)
    {
      unsigned i;

      preg->translate
	= (RE_TRANSLATE_TYPE) xmalloc (CHAR_SET_SIZE
				       * sizeof (*(RE_TRANSLATE_TYPE)0));
      if (preg->translate == NULL)
	return (int) REG_ESPACE;

      /* Map uppercase characters to corresponding lowercase ones.  */

83475:88cd30b5064d

     struct range_table_work_area *work_area;
{
  work_area->allocated += 16 * sizeof (int);
  if (work_area->table)
    work_area->table
      = (int *) realloc (work_area->table, work_area->allocated);
  else
    work_area->table
      = (int *) malloc (work_area->allocated);
}

#ifdef emacs

/* Carefully find the ranges of codes that are equivalent

      {
	fail_stack.size = re_max_failures * TYPICAL_FAILURE_SIZE;

	if (! fail_stack.stack)
	  fail_stack.stack
	    = (fail_stack_elt_t *) malloc (fail_stack.size
					    * sizeof (fail_stack_elt_t));
	else
	  fail_stack.stack
	    = (fail_stack_elt_t *) realloc (fail_stack.stack,
					     (fail_stack.size
					      * sizeof (fail_stack_elt_t)));
      }

    regex_grow_registers (num_regs);

  preg->buffer = 0;
  preg->allocated = 0;
  preg->used = 0;

  /* Try to allocate space for the fastmap.  */
  preg->fastmap = (char *) malloc (1 << BYTEWIDTH);

  if (cflags & REG_ICASE)
    {
      unsigned i;

      preg->translate
	= (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE
				       * sizeof (*(RE_TRANSLATE_TYPE)0));
      if (preg->translate == NULL)
	return (int) REG_ESPACE;

      /* Map uppercase characters to corresponding lowercase ones.  */