comparison src/ccl.c @ 46370:40db0673e6f0

Most uses of XSTRING combined with STRING_BYTES or indirection changed to SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references left unchanged for now.

46369:dd1d3b1d0053

    {
      i = XFASTINT (AREF (status, 8));
      if (ccl.ic < i && i < ccl.size)
	ccl.ic = i;
    }
  outbufsize = STRING_BYTES (XSTRING (str)) * ccl.buf_magnification + 256;
  outbuf = (char *) xmalloc (outbufsize);
  ccl.last_block = NILP (contin);
  ccl.multibyte = STRING_MULTIBYTE (str);
  produced = ccl_driver (&ccl, XSTRING (str)->data, outbuf,
			 STRING_BYTES (XSTRING (str)), outbufsize, (int *) 0);
  for (i = 0; i < 8; i++)
    XSET (AREF (status, i), Lisp_Int, ccl.reg[i]);
  XSETINT (AREF (status, 8), ccl.ic);
  UNGCPRO;

46370:40db0673e6f0

    {
      i = XFASTINT (AREF (status, 8));
      if (ccl.ic < i && i < ccl.size)
	ccl.ic = i;
    }
  outbufsize = SBYTES (str) * ccl.buf_magnification + 256;
  outbuf = (char *) xmalloc (outbufsize);
  ccl.last_block = NILP (contin);
  ccl.multibyte = STRING_MULTIBYTE (str);
  produced = ccl_driver (&ccl, SDATA (str), outbuf,
			 SBYTES (str), outbufsize, (int *) 0);
  for (i = 0; i < 8; i++)
    XSET (AREF (status, i), Lisp_Int, ccl.reg[i]);
  XSETINT (AREF (status, 8), ccl.ic);
  UNGCPRO;