Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Mark PyUnicode_FromUCS[124] as private

This commit is contained in:
Victor Stinner 2011-09-28 22:20:48 +02:00
parent ff9e50fd04
commit e57b1c0da1
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Objects/stringlib/ucs1lib.h
View File

@ -19,7 +19,7 @@
#define STRINGLIB_FILL Py_UNICODE_FILL #define STRINGLIB_FILL Py_UNICODE_FILL
#define STRINGLIB_STR PyUnicode_1BYTE_DATA #define STRINGLIB_STR PyUnicode_1BYTE_DATA
#define STRINGLIB_LEN PyUnicode_GET_LENGTH #define STRINGLIB_LEN PyUnicode_GET_LENGTH
#define STRINGLIB_NEW PyUnicode_FromUCS1 #define STRINGLIB_NEW _PyUnicode_FromUCS1
#define STRINGLIB_RESIZE not_supported #define STRINGLIB_RESIZE not_supported
#define STRINGLIB_CHECK PyUnicode_Check #define STRINGLIB_CHECK PyUnicode_Check
#define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact #define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact

2
Objects/stringlib/ucs2lib.h
View File

@ -19,7 +19,7 @@
#define STRINGLIB_FILL Py_UNICODE_FILL #define STRINGLIB_FILL Py_UNICODE_FILL
#define STRINGLIB_STR PyUnicode_1BYTE_DATA #define STRINGLIB_STR PyUnicode_1BYTE_DATA
#define STRINGLIB_LEN PyUnicode_GET_LENGTH #define STRINGLIB_LEN PyUnicode_GET_LENGTH
#define STRINGLIB_NEW PyUnicode_FromUCS2 #define STRINGLIB_NEW _PyUnicode_FromUCS2
#define STRINGLIB_RESIZE not_supported #define STRINGLIB_RESIZE not_supported
#define STRINGLIB_CHECK PyUnicode_Check #define STRINGLIB_CHECK PyUnicode_Check
#define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact #define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact

2
Objects/stringlib/ucs4lib.h
View File

@ -19,7 +19,7 @@
#define STRINGLIB_FILL Py_UNICODE_FILL #define STRINGLIB_FILL Py_UNICODE_FILL
#define STRINGLIB_STR PyUnicode_1BYTE_DATA #define STRINGLIB_STR PyUnicode_1BYTE_DATA
#define STRINGLIB_LEN PyUnicode_GET_LENGTH #define STRINGLIB_LEN PyUnicode_GET_LENGTH
#define STRINGLIB_NEW PyUnicode_FromUCS4 #define STRINGLIB_NEW _PyUnicode_FromUCS4
#define STRINGLIB_RESIZE not_supported #define STRINGLIB_RESIZE not_supported
#define STRINGLIB_CHECK PyUnicode_Check #define STRINGLIB_CHECK PyUnicode_Check
#define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact #define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact

20
Objects/unicodeobject.c
View File

@ -1117,8 +1117,8 @@ PyUnicode_FromString(const char *u)
return PyUnicode_FromStringAndSize(u, size); return PyUnicode_FromStringAndSize(u, size);
} }
PyObject* static PyObject*
PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size) _PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)
{ {
PyObject *res; PyObject *res;
unsigned char max = 127; unsigned char max = 127;
@ -1136,8 +1136,8 @@ PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)
return res; return res;
} }
PyObject* static PyObject*
PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size) _PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)
{ {
PyObject *res; PyObject *res;
Py_UCS2 max = 0; Py_UCS2 max = 0;
@ -1156,8 +1156,8 @@ PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)
return res; return res;
} }
PyObject* static PyObject*
PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size) _PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)
{ {
PyObject *res; PyObject *res;
Py_UCS4 max = 0; Py_UCS4 max = 0;
@ -1184,11 +1184,11 @@ PyUnicode_FromKindAndData(int kind, const void *buffer, Py_ssize_t size)
{ {
switch(kind) { switch(kind) {
case PyUnicode_1BYTE_KIND: case PyUnicode_1BYTE_KIND:
return PyUnicode_FromUCS1(buffer, size); return _PyUnicode_FromUCS1(buffer, size);
case PyUnicode_2BYTE_KIND: case PyUnicode_2BYTE_KIND:
return PyUnicode_FromUCS2(buffer, size); return _PyUnicode_FromUCS2(buffer, size);
case PyUnicode_4BYTE_KIND: case PyUnicode_4BYTE_KIND:
return PyUnicode_FromUCS4(buffer, size); return _PyUnicode_FromUCS4(buffer, size);
} }
assert(0); assert(0);
return NULL; return NULL;
@ -5645,7 +5645,7 @@ PyUnicode_DecodeLatin1(const char *s,
const char *errors) const char *errors)
{ {
/* Latin-1 is equivalent to the first 256 ordinals in Unicode. */ /* Latin-1 is equivalent to the first 256 ordinals in Unicode. */
return PyUnicode_FromUCS1((unsigned char*)s, size); return _PyUnicode_FromUCS1((unsigned char*)s, size);
} }
/* create or adjust a UnicodeEncodeError */ /* create or adjust a UnicodeEncodeError */