Mark PyUnicode_FromUCS[124] as private

Victor Stinner · Victor Stinner · commit e57b1c0da18c · 2011-09-28T22:20:48.000+02:00
diff --git a/Objects/stringlib/ucs1lib.h b/Objects/stringlib/ucs1lib.h
@@ -19,7 +19,7 @@
 #define STRINGLIB_FILL           Py_UNICODE_FILL
 #define STRINGLIB_STR            PyUnicode_1BYTE_DATA
 #define STRINGLIB_LEN            PyUnicode_GET_LENGTH
-#define STRINGLIB_NEW            PyUnicode_FromUCS1
+#define STRINGLIB_NEW            _PyUnicode_FromUCS1
 #define STRINGLIB_RESIZE         not_supported
 #define STRINGLIB_CHECK          PyUnicode_Check
 #define STRINGLIB_CHECK_EXACT    PyUnicode_CheckExact
diff --git a/Objects/stringlib/ucs2lib.h b/Objects/stringlib/ucs2lib.h
@@ -19,7 +19,7 @@
 #define STRINGLIB_FILL           Py_UNICODE_FILL
 #define STRINGLIB_STR            PyUnicode_1BYTE_DATA
 #define STRINGLIB_LEN            PyUnicode_GET_LENGTH
-#define STRINGLIB_NEW            PyUnicode_FromUCS2
+#define STRINGLIB_NEW            _PyUnicode_FromUCS2
 #define STRINGLIB_RESIZE         not_supported
 #define STRINGLIB_CHECK          PyUnicode_Check
 #define STRINGLIB_CHECK_EXACT    PyUnicode_CheckExact
diff --git a/Objects/stringlib/ucs4lib.h b/Objects/stringlib/ucs4lib.h
@@ -19,7 +19,7 @@
 #define STRINGLIB_FILL           Py_UNICODE_FILL
 #define STRINGLIB_STR            PyUnicode_1BYTE_DATA
 #define STRINGLIB_LEN            PyUnicode_GET_LENGTH
-#define STRINGLIB_NEW            PyUnicode_FromUCS4
+#define STRINGLIB_NEW            _PyUnicode_FromUCS4
 #define STRINGLIB_RESIZE         not_supported
 #define STRINGLIB_CHECK          PyUnicode_Check
 #define STRINGLIB_CHECK_EXACT    PyUnicode_CheckExact
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -1117,8 +1117,8 @@ PyUnicode_FromString(const char *u)
     return PyUnicode_FromStringAndSize(u, size);
 }
 
-PyObject*
-PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)
+static PyObject*
+_PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)
 {
     PyObject *res;
     unsigned char max = 127;
@@ -1136,8 +1136,8 @@ PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)
     return res;
 }
 
-PyObject*
-PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)
+static PyObject*
+_PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)
 {
     PyObject *res;
     Py_UCS2 max = 0;
@@ -1156,8 +1156,8 @@ PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)
     return res;
 }
 
-PyObject*
-PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)
+static PyObject*
+_PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)
 {
     PyObject *res;
     Py_UCS4 max = 0;
@@ -1184,11 +1184,11 @@ PyUnicode_FromKindAndData(int kind, const void *buffer, Py_ssize_t size)
 {
     switch(kind) {
     case PyUnicode_1BYTE_KIND:
-        return PyUnicode_FromUCS1(buffer, size);
+        return _PyUnicode_FromUCS1(buffer, size);
     case PyUnicode_2BYTE_KIND:
-        return PyUnicode_FromUCS2(buffer, size);
+        return _PyUnicode_FromUCS2(buffer, size);
     case PyUnicode_4BYTE_KIND:
-        return PyUnicode_FromUCS4(buffer, size);
+        return _PyUnicode_FromUCS4(buffer, size);
     }
     assert(0);
     return NULL;
@@ -5645,7 +5645,7 @@ PyUnicode_DecodeLatin1(const char *s,
 		       const char *errors)
 {
     /* 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 */

Original file line number	Diff line number	Diff line change
`@@ -1117,8 +1117,8 @@ PyUnicode_FromString(const char *u)`
`1117`	`1117`	`return PyUnicode_FromStringAndSize(u, size);`
`1118`	`1118`	`}`
`1119`	`1119`
`1120`		`-PyObject*`
`1121`		`-PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)`
	`1120`	`+static PyObject*`
	`1121`	`+_PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)`
`1122`	`1122`	`{`
`1123`	`1123`	`PyObject *res;`
`1124`	`1124`	`unsigned char max = 127;`
`@@ -1136,8 +1136,8 @@ PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)`
`1136`	`1136`	`return res;`
`1137`	`1137`	`}`
`1138`	`1138`
`1139`		`-PyObject*`
`1140`		`-PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)`
	`1139`	`+static PyObject*`
	`1140`	`+_PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)`
`1141`	`1141`	`{`
`1142`	`1142`	`PyObject *res;`
`1143`	`1143`	`Py_UCS2 max = 0;`
`@@ -1156,8 +1156,8 @@ PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)`
`1156`	`1156`	`return res;`
`1157`	`1157`	`}`
`1158`	`1158`
`1159`		`-PyObject*`
`1160`		`-PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)`
	`1159`	`+static PyObject*`
	`1160`	`+_PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)`
`1161`	`1161`	`{`
`1162`	`1162`	`PyObject *res;`
`1163`	`1163`	`Py_UCS4 max = 0;`
`@@ -1184,11 +1184,11 @@ PyUnicode_FromKindAndData(int kind, const void *buffer, Py_ssize_t size)`
`1184`	`1184`	`{`
`1185`	`1185`	`switch(kind) {`
`1186`	`1186`	`case PyUnicode_1BYTE_KIND:`
`1187`		`- return PyUnicode_FromUCS1(buffer, size);`
	`1187`	`+ return _PyUnicode_FromUCS1(buffer, size);`
`1188`	`1188`	`case PyUnicode_2BYTE_KIND:`
`1189`		`- return PyUnicode_FromUCS2(buffer, size);`
	`1189`	`+ return _PyUnicode_FromUCS2(buffer, size);`
`1190`	`1190`	`case PyUnicode_4BYTE_KIND:`
`1191`		`- return PyUnicode_FromUCS4(buffer, size);`
	`1191`	`+ return _PyUnicode_FromUCS4(buffer, size);`
`1192`	`1192`	`}`
`1193`	`1193`	`assert(0);`
`1194`	`1194`	`return NULL;`
`@@ -5645,7 +5645,7 @@ PyUnicode_DecodeLatin1(const char *s,`
`5645`	`5645`	`const char *errors)`
`5646`	`5646`	`{`
`5647`	`5647`	`/* Latin-1 is equivalent to the first 256 ordinals in Unicode. */`
`5648`		`- return PyUnicode_FromUCS1((unsigned char*)s, size);`
	`5648`	`+ return _PyUnicode_FromUCS1((unsigned char*)s, size);`
`5649`	`5649`	`}`
`5650`	`5650`
`5651`	`5651`	`/* create or adjust a UnicodeEncodeError */`