diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-06 02:01:29 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-06 02:01:29 +0200 |
| commit | f955eb210fef42cabd831211177e646f27dd698f (patch) | |
| tree | 83ca92ed4318dc88995bc4a25486c44a6c535ba7 | |
| parent | 71e44cb97ffaaa3a777477aa6dcb0b0f29c9eda4 (diff) | |
| parent | d88d9836c541258a46acb153cd488de2a04b60db (diff) | |
| download | cpython-git-f955eb210fef42cabd831211177e646f27dd698f.tar.gz | |
Merge 3.2: Fix PyUnicode_AsWideCharString() doc
- Fix PyUnicode_AsWideCharString() doc: size doesn't contain the null
character
- Fix spelling of the null character
| -rw-r--r-- | Include/unicodeobject.h | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 68298b05e6..50efe72c1c 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -608,7 +608,7 @@ PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar( /* 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 - 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) on success. On error, returns NULL, *size is undefined and raises a diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 94b7b61802..174455f07e 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1204,12 +1204,12 @@ PyUnicode_FromFormat(const char *format, ...) /* Helper function for PyUnicode_AsWideChar() and PyUnicode_AsWideCharString(): 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. - - 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 - the nul character). */ + the null character). */ static Py_ssize_t unicode_aswidechar(PyUnicodeObject *unicode, wchar_t *w, @@ -1257,7 +1257,7 @@ unicode_aswidechar(PyUnicodeObject *unicode, return w - worig; } else { - nchar = 1; /* nul character at the end */ + nchar = 1; /* null character at the end */ while (u != uend) { if (0xD800 <= u[0] && u[0] <= 0xDBFF && 0xDC00 <= u[1] && u[1] <= 0xDFFF) @@ -1295,7 +1295,7 @@ unicode_aswidechar(PyUnicodeObject *unicode, return w - worig; } else { - nchar = 1; /* nul character */ + nchar = 1; /* null character */ while (u != uend) { if (*u > 0xffff) nchar += 2; |