diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-06 02:00:05 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-06 02:00:05 +0200 |
| commit | 4391045b0d22dbe7f58eafd470a0a225112fe43f (patch) | |
| tree | 263ca47692ce1860c4fc711c4972d1304ed7d0a4 /Objects | |
| parent | 0b09b1eb92a11ee654d9f29ae0b44b937785fbbc (diff) | |
| download | cpython-4391045b0d22dbe7f58eafd470a0a225112fe43f.tar.gz | |
Fix PyUnicode_AsWideCharString() doc: size doesn't contain the null character
Fix also spelling of the null character.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 8567a9f2db..7316abfc9c 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1187,12 +1187,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, @@ -1240,7 +1240,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) @@ -1278,7 +1278,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; |