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

Fix PyUnicode_AsWideCharString() doc: size doesn't contain the null character 

Fix also spelling of the null character.
This commit is contained in:
Victor Stinner 2011-09-06 02:00:05 +02:00
parent a1bea6e10c
commit d88d9836c5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/unicodeobject.h
View File

@ -595,7 +595,7 @@ PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
/* Convert the Unicode object to a wide character string. The output string /* Convert the Unicode object to a wide character string. The output string
always ends with a nul character. If size is not NULL, write the number of always ends with a nul character. If size is not NULL, write the number of
wide characters (including the nul character) into *size. wide characters (excluding the null character) into *size.
Returns a buffer allocated by PyMem_Alloc() (use PyMem_Free() to free it) Returns a buffer allocated by PyMem_Alloc() (use PyMem_Free() to free it)
on success. On error, returns NULL, *size is undefined and raises a on success. On error, returns NULL, *size is undefined and raises a

10
Objects/unicodeobject.c
View File

@ -1187,12 +1187,12 @@ PyUnicode_FromFormat(const char *format, ...)
/* Helper function for PyUnicode_AsWideChar() and PyUnicode_AsWideCharString(): /* Helper function for PyUnicode_AsWideChar() and PyUnicode_AsWideCharString():
convert a Unicode object to a wide character string. convert a Unicode object to a wide character string.
- If w is NULL: return the number of wide characters (including the nul - If w is NULL: return the number of wide characters (including the null
character) required to convert the unicode object. Ignore size argument. character) required to convert the unicode object. Ignore size argument.
- Otherwise: return the number of wide characters (excluding the nul - Otherwise: return the number of wide characters (excluding the null
character) written into w. Write at most size wide characters (including character) written into w. Write at most size wide characters (including
the nul character). */ the null character). */
static Py_ssize_t static Py_ssize_t
unicode_aswidechar(PyUnicodeObject *unicode, unicode_aswidechar(PyUnicodeObject *unicode,
wchar_t *w, wchar_t *w,
@ -1240,7 +1240,7 @@ unicode_aswidechar(PyUnicodeObject *unicode,
return w - worig; return w - worig;
} }
else { else {
nchar = 1; /* nul character at the end */ nchar = 1; /* null character at the end */
while (u != uend) { while (u != uend) {
if (0xD800 <= u[0] && u[0] <= 0xDBFF if (0xD800 <= u[0] && u[0] <= 0xDBFF
&& 0xDC00 <= u[1] && u[1] <= 0xDFFF) && 0xDC00 <= u[1] && u[1] <= 0xDFFF)
@ -1278,7 +1278,7 @@ unicode_aswidechar(PyUnicodeObject *unicode,
return w - worig; return w - worig;
} }
else { else {
nchar = 1; /* nul character */ nchar = 1; /* null character */
while (u != uend) { while (u != uend) {
if (*u > 0xffff) if (*u > 0xffff)
nchar += 2; nchar += 2;