comparison src/ccl.c @ 51326:92b845a3d3a6

(CCL_WRITE_CHAR): Increment extra_bytes only when it is nonzero. (ccl_driver): Initialize extra_bytes to ccl->eight_bit_control. (setup_ccl_program): Initialize ccl->eight_bit_control to zero.

51325:6ef863c4a5d8

    else if (dst + bytes + extra_bytes < (dst_bytes ? dst_end : src))	\
      {									\
	if (bytes == 1)							\
	  {								\
	    *dst++ = (ch);						\
	    if ((ch) >= 0x80 && (ch) < 0xA0)				\
	      /* We may have to convert this eight-bit char to		\
		 multibyte form later.  */				\
	      extra_bytes++;						\
	  }								\
	else if (CHAR_VALID_P (ch, 0))					\

  int this_ic = 0;
  /* CCL_WRITE_CHAR will produce 8-bit code of range 0x80..0x9F.  But,
     each of them will be converted to multibyte form of 2-byte
     sequence.  For that conversion, we remember how many more bytes
     we must keep in DESTINATION in this variable.  */
  int extra_bytes = 0;

  if (ic >= ccl->eof_ic)
    ic = CCL_HEADER_MAIN;

  if (ccl->buf_magnification == 0) /* We can't produce any bytes.  */

 ccl_finish:
  ccl->ic = ic;
  ccl->stack_idx = stack_idx;
  ccl->prog = ccl_prog;
  ccl->eight_bit_control = (extra_bytes > 0);
  if (consumed)
    *consumed = src - source;
  return (dst ? dst - destination : 0);
}

  ccl->private_state = 0;
  ccl->status = 0;
  ccl->stack_idx = 0;
  ccl->eol_type = CODING_EOL_LF;
  ccl->suppress_error = 0;
  return 0;
}

DEFUN ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0,
       doc: /* Return t if OBJECT is a CCL program name or a compiled CCL program code.

51326:92b845a3d3a6

    else if (dst + bytes + extra_bytes < (dst_bytes ? dst_end : src))	\
      {									\
	if (bytes == 1)							\
	  {								\
	    *dst++ = (ch);						\
	    if (extra_bytes && (ch) >= 0x80 && (ch) < 0xA0)		\
	      /* We may have to convert this eight-bit char to		\
		 multibyte form later.  */				\
	      extra_bytes++;						\
	  }								\
	else if (CHAR_VALID_P (ch, 0))					\

  int this_ic = 0;
  /* CCL_WRITE_CHAR will produce 8-bit code of range 0x80..0x9F.  But,
     each of them will be converted to multibyte form of 2-byte
     sequence.  For that conversion, we remember how many more bytes
     we must keep in DESTINATION in this variable.  */
  int extra_bytes = ccl->eight_bit_control;

  if (ic >= ccl->eof_ic)
    ic = CCL_HEADER_MAIN;

  if (ccl->buf_magnification == 0) /* We can't produce any bytes.  */

 ccl_finish:
  ccl->ic = ic;
  ccl->stack_idx = stack_idx;
  ccl->prog = ccl_prog;
  ccl->eight_bit_control = (extra_bytes > 1);
  if (consumed)
    *consumed = src - source;
  return (dst ? dst - destination : 0);
}

  ccl->private_state = 0;
  ccl->status = 0;
  ccl->stack_idx = 0;
  ccl->eol_type = CODING_EOL_LF;
  ccl->suppress_error = 0;
  ccl->eight_bit_control = 0;
  return 0;
}

DEFUN ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0,
       doc: /* Return t if OBJECT is a CCL program name or a compiled CCL program code.