Fix a compiler warning in _copy_characters() and remove debug code

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index d5d83fde3c817108ec9504a9a6bf15846baa724c..cf9aec2b1f29314ae3d6d77b1f085b4412828f19 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1156,7 +1156,7 @@ _copy_characters(PyObject *to, Py_ssize_t to_start,
             if (check_maxchar) {
                 Py_UCS4 max_char;
                 max_char = ucs1lib_find_max_char(from_data,
-                                                 (char*)from_data + how_many);
+                                                 (Py_UCS1*)from_data + how_many);
                 if (max_char >= 128)
                     return -1;
             }
@@ -3860,11 +3860,6 @@ PyUnicode_AsUTF8(PyObject *unicode)
     return PyUnicode_AsUTF8AndSize(unicode, NULL);
 }
 
-#ifdef Py_DEBUG
-static int unicode_as_unicode_calls = 0;
-#endif
-
-
 Py_UNICODE *
 PyUnicode_AsUnicodeAndSize(PyObject *unicode, Py_ssize_t *size)
 {
@@ -3888,10 +3883,6 @@ PyUnicode_AsUnicodeAndSize(PyObject *unicode, Py_ssize_t *size)
         assert(_PyUnicode_KIND(unicode) != 0);
         assert(PyUnicode_IS_READY(unicode));
 
-#ifdef Py_DEBUG
-        ++unicode_as_unicode_calls;
-#endif
-
         if (PyUnicode_KIND(unicode) == PyUnicode_4BYTE_KIND) {
 #if SIZEOF_WCHAR_T == 2
             four_bytes = PyUnicode_4BYTE_DATA(unicode);