aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.h
diff options
context:
space:
mode:
authorEli Zaretskii2019-04-28 17:14:39 +0300
committerEli Zaretskii2019-04-28 17:14:39 +0300
commit6b6a6f06b4df9d76ad50294d0b6e88978ffb27d0 (patch)
treeeb6d3c33d20a57caa9cb2430029249b88b1752fa /src/coding.h
parent75ee20364c5ed4c175b13debaa53a2ba14168999 (diff)
downloademacs-6b6a6f06b4df9d76ad50294d0b6e88978ffb27d0.tar.gz
emacs-6b6a6f06b4df9d76ad50294d0b6e88978ffb27d0.zip
Fix names of functions in last commit
* src/coding.h (build_string_from_utf8): Rename from build_utf8_string. All callers changed. * src/coding.c (make_string_from_utf8): Rename from make_utf8_string. All callers changed.
Diffstat (limited to 'src/coding.h')
-rw-r--r--src/coding.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/coding.h b/src/coding.h
index 773df9abb90..619ca29c8e4 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -695,7 +695,7 @@ extern Lisp_Object raw_text_coding_system (Lisp_Object);
695extern bool raw_text_coding_system_p (struct coding_system *); 695extern bool raw_text_coding_system_p (struct coding_system *);
696extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object); 696extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object);
697extern Lisp_Object complement_process_encoding_system (Lisp_Object); 697extern Lisp_Object complement_process_encoding_system (Lisp_Object);
698extern Lisp_Object make_utf8_string (const char *, ptrdiff_t); 698extern Lisp_Object make_string_from_utf8 (const char *, ptrdiff_t);
699 699
700extern void decode_coding_gap (struct coding_system *, 700extern void decode_coding_gap (struct coding_system *,
701 ptrdiff_t, ptrdiff_t); 701 ptrdiff_t, ptrdiff_t);
@@ -763,14 +763,13 @@ surrogates_to_codepoint (int low, int high)
763 return 0x10000 + (low - 0xDC00) + ((high - 0xD800) * 0x400); 763 return 0x10000 + (low - 0xDC00) + ((high - 0xD800) * 0x400);
764} 764}
765 765
766/* Create a multibyte Lisp string from the NUL-terminated UTF-8 string 766/* Like build_string, but always returns a multibyte string, and is
767 beginning at DATA. If the string is not a valid UTF-8 string, an 767 optimized for speed when STR is a UTF-8 encoded text string. */
768 unspecified string is returned. */
769 768
770INLINE Lisp_Object 769INLINE Lisp_Object
771build_utf8_string (const char *data) 770build_string_from_utf8 (const char *str)
772{ 771{
773 return make_utf8_string (data, strlen (data)); 772 return make_string_from_utf8 (str, strlen (str));
774} 773}
775 774
776 775