traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge default heads

This commit is contained in:
Kurt B. Kaiser 2011-03-24 23:41:20 -04:00
parent e88893ccc6 1aef6b6e1e
commit e093b0d185
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Objects/bytesobject.c
View File

@ -41,10 +41,6 @@ static PyBytesObject *nullstring;
#define PyBytesObject_SIZE (offsetof(PyBytesObject, ob_sval) + 1) #define PyBytesObject_SIZE (offsetof(PyBytesObject, ob_sval) + 1)
/* /*
For both PyBytes_FromString() and PyBytes_FromStringAndSize(), the
parameter `size' denotes number of characters to allocate, not counting any
null terminating character.
For PyBytes_FromString(), the parameter `str' points to a null-terminated For PyBytes_FromString(), the parameter `str' points to a null-terminated
string containing exactly `size' bytes. string containing exactly `size' bytes.
@ -61,8 +57,8 @@ static PyBytesObject *nullstring;
The PyObject member `op->ob_size', which denotes the number of "extra The PyObject member `op->ob_size', which denotes the number of "extra
items" in a variable-size object, will contain the number of bytes items" in a variable-size object, will contain the number of bytes
allocated for string data, not counting the null terminating character. It allocated for string data, not counting the null terminating character.
is therefore equal to the equal to the `size' parameter (for It is therefore equal to the `size' parameter (for
PyBytes_FromStringAndSize()) or the length of the string in the `str' PyBytes_FromStringAndSize()) or the length of the string in the `str'
parameter (for PyBytes_FromString()). parameter (for PyBytes_FromString()).
*/ */