diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-07 01:02:42 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-07 01:02:42 (GMT) |
| commit | beb4135b8c81e1dbbb841ecd7355ab5a09a3edd2 (patch) | |
| tree | 5477c04eae02035c7d3df9efb50f3a7fc6dd78a1 /Modules | |
| parent | ef12810f0c23a0c0e8b276e76d289f0f211ab5bb (diff) | |
| download | cpython-beb4135b8c81e1dbbb841ecd7355ab5a09a3edd2.zip cpython-beb4135b8c81e1dbbb841ecd7355ab5a09a3edd2.tar.gz cpython-beb4135b8c81e1dbbb841ecd7355ab5a09a3edd2.tar.bz2 | |
PyUnicode_AsWideCharString() takes a PyObject*, not a PyUnicodeObject*
All unicode functions uses PyObject* except PyUnicode_AsWideChar(). Fix the
prototype for the new function PyUnicode_AsWideCharString().
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/callproc.c | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/cfield.c | 2 | ||||
| -rw-r--r-- | Modules/_localemodule.c | 4 | ||||
| -rw-r--r-- | Modules/_testcapimodule.c | 2 | ||||
| -rw-r--r-- | Modules/timemodule.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index ce2acb5..737e4c3 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -666,7 +666,7 @@ static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa) return 0; #else pa->ffi_type = &ffi_type_pointer; - pa->value.p = PyUnicode_AsWideCharString((PyUnicodeObject *)obj, NULL); + pa->value.p = PyUnicode_AsWideCharString(obj, NULL); if (pa->value.p == NULL) return -1; pa->keep = PyCapsule_New(pa->value.p, CTYPES_CAPSULE_NAME_PYMEM, pymem_destructor); diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index 072b8c6..ab293f7 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -1434,7 +1434,7 @@ Z_set(void *ptr, PyObject *value, Py_ssize_t size) PyObject *keep; wchar_t *buffer; - buffer = PyUnicode_AsWideCharString((PyUnicodeObject *)value, NULL); + buffer = PyUnicode_AsWideCharString(value, NULL); if (!buffer) { Py_DECREF(value); return NULL; diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 67d16f4..1001dd2 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -246,10 +246,10 @@ PyLocale_strcoll(PyObject* self, PyObject* args) if (!PyArg_ParseTuple(args, "UU:strcoll", &os1, &os2)) return NULL; /* Convert the unicode strings to wchar[]. */ - ws1 = PyUnicode_AsWideCharString((PyUnicodeObject*)os1, NULL); + ws1 = PyUnicode_AsWideCharString(os1, NULL); if (ws1 == NULL) goto done; - ws2 = PyUnicode_AsWideCharString((PyUnicodeObject*)os2, NULL); + ws2 = PyUnicode_AsWideCharString(os2, NULL); if (ws2 == NULL) goto done; /* Collate the strings. */ diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 912ba17..473d805 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -1426,7 +1426,7 @@ unicode_aswidecharstring(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "U", &unicode)) return NULL; - buffer = PyUnicode_AsWideCharString((PyUnicodeObject*)unicode, &size); + buffer = PyUnicode_AsWideCharString(unicode, &size); if (buffer == NULL) return NULL; diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 1a85662..5e6cd6c 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -502,7 +502,7 @@ time_strftime(PyObject *self, PyObject *args) buf.tm_isdst = 1; #ifdef HAVE_WCSFTIME - format = PyUnicode_AsWideCharString((PyUnicodeObject*)format_arg, NULL); + format = PyUnicode_AsWideCharString(format_arg, NULL); if (format == NULL) return NULL; fmt = format; |