comparison src/data.c @ 50632:bd83590b911a

(Faset): Calculate nbytes earlier, to satisfy the now pickier PARSE_MULTIBYTE_SEQ.

50631:763258a2d395

	  XCHAR_TABLE (array)->contents[code[i]] = newelt;
	}
    }
  else if (STRING_MULTIBYTE (array))
    {
      int idxval_byte, prev_bytes, new_bytes;
      unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1;

      if (idxval < 0 || idxval >= SCHARS (array))
	args_out_of_range (array, idx);
      CHECK_NUMBER (newelt);

      idxval_byte = string_char_to_byte (array, idxval);
      p1 = SDATA (array) + idxval_byte;
      PARSE_MULTIBYTE_SEQ (p1, nbytes - idxval_byte, prev_bytes);
      new_bytes = CHAR_STRING (XINT (newelt), p0);
      if (prev_bytes != new_bytes)
	{
	  /* We must relocate the string data.  */
	  int nchars = SCHARS (array);
	  int nbytes = SBYTES (array);
	  unsigned char *str;

	  str = (nbytes <= MAX_ALLOCA
		 ? (unsigned char *) alloca (nbytes)
		 : (unsigned char *) xmalloc (nbytes));

50632:bd83590b911a

	  XCHAR_TABLE (array)->contents[code[i]] = newelt;
	}
    }
  else if (STRING_MULTIBYTE (array))
    {
      int idxval_byte, prev_bytes, new_bytes, nbytes;
      unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1;

      if (idxval < 0 || idxval >= SCHARS (array))
	args_out_of_range (array, idx);
      CHECK_NUMBER (newelt);

      nbytes = SBYTES (array);

      idxval_byte = string_char_to_byte (array, idxval);
      p1 = SDATA (array) + idxval_byte;
      PARSE_MULTIBYTE_SEQ (p1, nbytes - idxval_byte, prev_bytes);
      new_bytes = CHAR_STRING (XINT (newelt), p0);
      if (prev_bytes != new_bytes)
	{
	  /* We must relocate the string data.  */
	  int nchars = SCHARS (array);
	  unsigned char *str;

	  str = (nbytes <= MAX_ALLOCA
		 ? (unsigned char *) alloca (nbytes)
		 : (unsigned char *) xmalloc (nbytes));