From 8a8b3eaabe0a3cf2f4df1b23239dde33d5dd10c4 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 16 Jun 2012 04:53:25 +0200 Subject: Fix a compiler warning in _copy_characters() and remove debug code --- Objects/unicodeobject.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index d5d83fd..cf9aec2 100644 --- 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); -- cgit v0.12