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

Mark _PyUnicode_FindMaxCharAndNumSurrogatePairs() as private

This commit is contained in:
Victor Stinner 2011-09-28 22:15:37 +02:00
parent fd85c3aa8d
commit 17222160e7
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Include/unicodeobject.h
View File

@ -543,18 +543,6 @@ PyAPI_FUNC(Py_ssize_t) PyUnicode_CopyCharacters(
); );
#endif #endif
/* Find the maximum code point and count the number of surrogate pairs so a
correct string length can be computed before converting a string to UCS4.
This function counts single surrogates as a character and not as a pair. */
#ifndef Py_LIMITED_API
PyAPI_FUNC(int) _PyUnicode_FindMaxCharAndNumSurrogatePairs(
const wchar_t *begin,
const wchar_t *end,
Py_UCS4 *maxchar,
Py_ssize_t *num_surrogates
);
#endif
/* Create a Unicode Object from the Py_UNICODE buffer u of the given /* Create a Unicode Object from the Py_UNICODE buffer u of the given
size. size.

17
Objects/unicodeobject.c
View File

@ -708,11 +708,14 @@ PyUnicode_CopyCharacters(PyObject *to, Py_ssize_t to_start,
return -1; return -1;
} }
int /* Find the maximum code point and count the number of surrogate pairs so a
_PyUnicode_FindMaxCharAndNumSurrogatePairs(const wchar_t *begin, correct string length can be computed before converting a string to UCS4.
const wchar_t *end, This function counts single surrogates as a character and not as a pair.
Py_UCS4 *maxchar,
Py_ssize_t *num_surrogates) Return 0 on success, or -1 on error. */
static int
find_maxchar_surrogates(const wchar_t *begin, const wchar_t *end,
Py_UCS4 *maxchar, Py_ssize_t *num_surrogates)
{ {
const wchar_t *iter; const wchar_t *iter;
@ -789,7 +792,7 @@ _PyUnicode_Ready(PyUnicodeObject *unicode)
#endif #endif
end = _PyUnicode_WSTR(unicode) + _PyUnicode_WSTR_LENGTH(unicode); end = _PyUnicode_WSTR(unicode) + _PyUnicode_WSTR_LENGTH(unicode);
if (_PyUnicode_FindMaxCharAndNumSurrogatePairs(_PyUnicode_WSTR(unicode), end, if (find_maxchar_surrogates(_PyUnicode_WSTR(unicode), end,
&maxchar, &maxchar,
&num_surrogates) == -1) { &num_surrogates) == -1) {
assert(0 && "PyUnicode_FindMaxCharAndNumSurrogatePairs failed"); assert(0 && "PyUnicode_FindMaxCharAndNumSurrogatePairs failed");
@ -1022,7 +1025,7 @@ PyUnicode_FromUnicode(const Py_UNICODE *u, Py_ssize_t size)
/* If not empty and not single character, copy the Unicode data /* If not empty and not single character, copy the Unicode data
into the new object */ into the new object */
if (_PyUnicode_FindMaxCharAndNumSurrogatePairs(u, u + size, &maxchar, if (find_maxchar_surrogates(u, u + size, &maxchar,
&num_surrogates) == -1) &num_surrogates) == -1)
return NULL; return NULL;