Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix a compiler warning in PyUnicode_Append() 

Don't check PyUnicode_CopyCharacters() in release mode. Rename also some
variables.
This commit is contained in:
Victor Stinner 2011-10-03 23:27:56 +02:00
parent 8cfcbed4e3
commit b803895355
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Objects/unicodeobject.c
View File

@ -9931,9 +9931,11 @@ PyUnicode_Append(PyObject **p_left, PyObject *right)
&& (_PyUnicode_KIND(right) <= _PyUnicode_KIND(left) && (_PyUnicode_KIND(right) <= _PyUnicode_KIND(left)
|| _PyUnicode_WSTR(left) != NULL)) || _PyUnicode_WSTR(left) != NULL))
{ {
Py_ssize_t u_len, v_len, new_len, copied; Py_ssize_t left_len, right_len, new_len;
#ifdef Py_DEBUG
Py_ssize_t copied;
#endif
/* FIXME: don't make wstr string ready */
if (PyUnicode_READY(left)) if (PyUnicode_READY(left))
goto error; goto error;
if (PyUnicode_READY(right)) if (PyUnicode_READY(right))
@ -9942,14 +9944,14 @@ PyUnicode_Append(PyObject **p_left, PyObject *right)
/* FIXME: support ascii+latin1, PyASCIIObject => PyCompactUnicodeObject */ /* FIXME: support ascii+latin1, PyASCIIObject => PyCompactUnicodeObject */
if (PyUnicode_MAX_CHAR_VALUE(right) <= PyUnicode_MAX_CHAR_VALUE(left)) if (PyUnicode_MAX_CHAR_VALUE(right) <= PyUnicode_MAX_CHAR_VALUE(left))
{ {
u_len = PyUnicode_GET_LENGTH(left); left_len = PyUnicode_GET_LENGTH(left);
v_len = PyUnicode_GET_LENGTH(right); right_len = PyUnicode_GET_LENGTH(right);
if (u_len > PY_SSIZE_T_MAX - v_len) { if (left_len > PY_SSIZE_T_MAX - right_len) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"strings are too large to concat"); "strings are too large to concat");
goto error; goto error;
} }
new_len = u_len + v_len; new_len = left_len + right_len;
/* Now we own the last reference to 'left', so we can resize it /* Now we own the last reference to 'left', so we can resize it
* in-place. * in-place.
@ -9964,10 +9966,14 @@ PyUnicode_Append(PyObject **p_left, PyObject *right)
goto error; goto error;
} }
/* copy 'right' into the newly allocated area of 'left' */ /* copy 'right' into the newly allocated area of 'left' */
copied = PyUnicode_CopyCharacters(left, u_len, #ifdef Py_DEBUG
copied = PyUnicode_CopyCharacters(left, left_len,
right, 0, right, 0,
v_len); right_len);
assert(0 <= copied); assert(0 <= copied);
#else
PyUnicode_CopyCharacters(left, left_len, right, 0, right_len);
#endif
*p_left = left; *p_left = left;
return; return;
} }