mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 04:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Victor Stinner 2012-06-16 04:53:25 +02:00
parent 24e403bbee
commit 8a8b3eaabe
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Objects/unicodeobject.c
View file

@ -1156,7 +1156,7 @@ _copy_characters(PyObject *to, Py_ssize_t to_start,
if (check_maxchar) { if (check_maxchar) {
Py_UCS4 max_char; Py_UCS4 max_char;
max_char = ucs1lib_find_max_char(from_data, max_char = ucs1lib_find_max_char(from_data,
(char*)from_data + how_many); (Py_UCS1*)from_data + how_many);
if (max_char >= 128) if (max_char >= 128)
return -1; return -1;
} }
@ -3860,11 +3860,6 @@ PyUnicode_AsUTF8(PyObject *unicode)
return PyUnicode_AsUTF8AndSize(unicode, NULL); return PyUnicode_AsUTF8AndSize(unicode, NULL);
} }
#ifdef Py_DEBUG
static int unicode_as_unicode_calls = 0;
#endif
Py_UNICODE * Py_UNICODE *
PyUnicode_AsUnicodeAndSize(PyObject *unicode, Py_ssize_t *size) 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_KIND(unicode) != 0);
assert(PyUnicode_IS_READY(unicode)); assert(PyUnicode_IS_READY(unicode));
#ifdef Py_DEBUG
++unicode_as_unicode_calls;
#endif
if (PyUnicode_KIND(unicode) == PyUnicode_4BYTE_KIND) { if (PyUnicode_KIND(unicode) == PyUnicode_4BYTE_KIND) {
#if SIZEOF_WCHAR_T == 2 #if SIZEOF_WCHAR_T == 2
four_bytes = PyUnicode_4BYTE_DATA(unicode); four_bytes = PyUnicode_4BYTE_DATA(unicode);