merge count_size_as_multibyte, parse_str_to_multibyte

* character.c, character.h (count_size_as_multibyte):
Renamed from parse_str_to_multibyte; all uses changed.
Check for integer overflow.
* insdel.c, lisp.h (count_size_as_multibyte): Remove,
since it's now a duplicate of the other.  This is more of
a character than a buffer op, so better that it's in character.c.
* fns.c, print.c: Adjust to above changes.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/print.c b/src/print.c
index f0624d5d16e..20c3e8ae526 100644
--- a/src/print.c
+++ b/src/print.c
@@ -381,7 +381,7 @@ print_string (Lisp_Object string, Lisp_Object printcharfun)
           EMACS_INT bytes;
 
           chars = SBYTES (string);
-          bytes = parse_str_to_multibyte (SDATA (string), chars);
+          bytes = count_size_as_multibyte (SDATA (string), chars);
           if (chars < bytes)
             {
               newstr = make_uninit_multibyte_string (chars, bytes);