comparison src/coding.c @ 60031:8d84cdf36525

(encode_coding_string): Always return a unibyte string. If NOCOPY is nonzero and there's no need of encoding, make STR unibyte directly.

60030:e41b38ec1a82

  Lisp_Object newstr;
  int consumed, consumed_char, produced, produced_char;

  if (SYMBOLP (coding->pre_write_conversion)
      && !NILP (Ffboundp (coding->pre_write_conversion)))
    str = run_pre_post_conversion_on_str (str, coding, 1);

  from = 0;
  to = SCHARS (str);
  to_byte = SBYTES (str);

  /* Encoding routines determine the multibyteness of the source text
     by coding->src_multibyte.  */
  coding->src_multibyte = STRING_MULTIBYTE (str);
  coding->dst_multibyte = 0;
  if (! CODING_REQUIRE_ENCODING (coding))
    {
      coding->consumed = SBYTES (str);
      coding->consumed_char = SCHARS (str);
      if (STRING_MULTIBYTE (str))
	{
	  str = Fstring_as_unibyte (str);
	  nocopy = 1;
	}
      coding->produced = SBYTES (str);
      coding->produced_char = SCHARS (str);
      return (nocopy ? str : Fcopy_sequence (str));
    }

  if (coding->composing != COMPOSITION_DISABLED)
    coding_save_composition (coding, from, to, str);

  /* Try to skip the heading and tailing ASCIIs.  We can't skip them

      SHRINK_CONVERSION_REGION (&from, &to_byte, coding, SDATA (str),
				1);
      if (from == to_byte)
	{
	  coding_free_composition_data (coding);
	  return (nocopy ? str : Fcopy_sequence (str));
	}
      shrinked_bytes = from + (SBYTES (str) - to_byte);
    }

  len = encoding_buffer_size (coding, to_byte - from);

  free_conversion_buffer (&buf);
  coding_free_composition_data (coding);

  return newstr;
}


#ifdef emacs
/*** 8. Emacs Lisp library functions ***/

60031:8d84cdf36525

  Lisp_Object newstr;
  int consumed, consumed_char, produced, produced_char;

  if (SYMBOLP (coding->pre_write_conversion)
      && !NILP (Ffboundp (coding->pre_write_conversion)))
    {
      str = run_pre_post_conversion_on_str (str, coding, 1);
      /* As STR is just newly generated, we don't have to copy it
	 anymore.  */
      nocopy = 1;
    }

  from = 0;
  to = SCHARS (str);
  to_byte = SBYTES (str);

  /* Encoding routines determine the multibyteness of the source text
     by coding->src_multibyte.  */
  coding->src_multibyte = SCHARS (str) < SBYTES (str);
  coding->dst_multibyte = 0;
  if (! CODING_REQUIRE_ENCODING (coding))
    goto no_need_of_encoding;

  if (coding->composing != COMPOSITION_DISABLED)
    coding_save_composition (coding, from, to, str);

  /* Try to skip the heading and tailing ASCIIs.  We can't skip them

      SHRINK_CONVERSION_REGION (&from, &to_byte, coding, SDATA (str),
				1);
      if (from == to_byte)
	{
	  coding_free_composition_data (coding);
	  goto no_need_of_encoding;
	}
      shrinked_bytes = from + (SBYTES (str) - to_byte);
    }

  len = encoding_buffer_size (coding, to_byte - from);

  free_conversion_buffer (&buf);
  coding_free_composition_data (coding);

  return newstr;

 no_need_of_encoding:
  coding->consumed = SBYTES (str);
  coding->consumed_char = SCHARS (str);
  if (STRING_MULTIBYTE (str))
    {
      if (nocopy)
	/* We are sure that STR doesn't contain a multibyte
	   character.  */
	STRING_SET_UNIBYTE (str);
      else
	{
	  str = Fstring_as_unibyte (str);
	  nocopy = 1;
	}
    }
  coding->produced = SBYTES (str);
  coding->produced_char = SCHARS (str);
  return (nocopy ? str : Fcopy_sequence (str));
}


#ifdef emacs
/*** 8. Emacs Lisp library functions ***/