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

Add PyUnicode_AsStringAndSize(), which is like PyUnicode_AsString() but

Browse source 
has an extra (optional) output parameter through which it returns the size.
Use this in a few places where I used PyUnicode_AsString() + strlen(),
and in one new place (which fixes test_pep263).
This commit is contained in:
Guido van Rossum 2007-08-29 13:53:23 +00:00
parent 9befa93b04
commit 7d1df6c9b1
4 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Objects/unicodeobject.c
View file

@ -1184,16 +1184,25 @@ PyObject *_PyUnicode_AsDefaultEncodedString(PyObject *unicode,
}
char*
PyUnicode_AsString(PyObject *unicode)
PyUnicode_AsStringAndSize(PyObject *unicode, Py_ssize_t *psize)
{
PyObject *str8;
if (!PyUnicode_Check(unicode)) {
PyErr_BadArgument();
return NULL;
}
unicode = _PyUnicode_AsDefaultEncodedString(unicode, NULL);
if (!unicode)
str8 = _PyUnicode_AsDefaultEncodedString(unicode, NULL);
if (str8 == NULL)
return NULL;
return PyString_AsString(unicode);
if (psize != NULL)
*psize = PyString_GET_SIZE(str8);
return PyString_AS_STRING(str8);
}
char*
PyUnicode_AsString(PyObject *unicode)
{
return PyUnicode_AsStringAndSize(unicode, NULL);
}
Py_UNICODE *PyUnicode_AsUnicode(PyObject *unicode)
@ -8098,6 +8107,7 @@ unicode_buffer_getbuffer(PyUnicodeObject *self, PyBuffer *view, int flags)
if (flags & PyBUF_CHARACTER) {
PyErr_SetString(PyExc_SystemError, "can't use str as char buffer");
abort();
return -1;
}
return PyBuffer_FillInfo(view, (void *)self->str,