diff options
Diffstat (limited to 'Python/codecs.c')
| -rw-r--r-- | Python/codecs.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index 5c521fb..2fcd6c5 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -460,7 +460,7 @@ PyObject *PyCodec_StrictErrors(PyObject *exc) #ifdef Py_USING_UNICODE PyObject *PyCodec_IgnoreErrors(PyObject *exc) { - int end; + Py_ssize_t end; if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { if (PyUnicodeEncodeError_GetEnd(exc, &end)) return NULL; @@ -478,16 +478,16 @@ PyObject *PyCodec_IgnoreErrors(PyObject *exc) return NULL; } /* ouch: passing NULL, 0, pos gives None instead of u'' */ - return Py_BuildValue("(u#i)", &end, 0, end); + return Py_BuildValue("(u#n)", &end, 0, end); } PyObject *PyCodec_ReplaceErrors(PyObject *exc) { PyObject *restuple; - int start; - int end; - int i; + Py_ssize_t start; + Py_ssize_t end; + Py_ssize_t i; if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { PyObject *res; @@ -502,7 +502,7 @@ PyObject *PyCodec_ReplaceErrors(PyObject *exc) for (p = PyUnicode_AS_UNICODE(res), i = start; i<end; ++p, ++i) *p = '?'; - restuple = Py_BuildValue("(Oi)", res, end); + restuple = Py_BuildValue("(On)", res, end); Py_DECREF(res); return restuple; } @@ -510,7 +510,7 @@ PyObject *PyCodec_ReplaceErrors(PyObject *exc) Py_UNICODE res = Py_UNICODE_REPLACEMENT_CHARACTER; if (PyUnicodeDecodeError_GetEnd(exc, &end)) return NULL; - return Py_BuildValue("(u#i)", &res, 1, end); + return Py_BuildValue("(u#n)", &res, 1, end); } else if (PyObject_IsInstance(exc, PyExc_UnicodeTranslateError)) { PyObject *res; @@ -525,7 +525,7 @@ PyObject *PyCodec_ReplaceErrors(PyObject *exc) for (p = PyUnicode_AS_UNICODE(res), i = start; i<end; ++p, ++i) *p = Py_UNICODE_REPLACEMENT_CHARACTER; - restuple = Py_BuildValue("(Oi)", res, end); + restuple = Py_BuildValue("(On)", res, end); Py_DECREF(res); return restuple; } @@ -540,8 +540,8 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc) if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { PyObject *restuple; PyObject *object; - int start; - int end; + Py_ssize_t start; + Py_ssize_t end; PyObject *res; Py_UNICODE *p; Py_UNICODE *startp; @@ -631,7 +631,7 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc) } *outp++ = ';'; } - restuple = Py_BuildValue("(Oi)", res, end); + restuple = Py_BuildValue("(On)", res, end); Py_DECREF(res); Py_DECREF(object); return restuple; @@ -652,8 +652,8 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc) if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) { PyObject *restuple; PyObject *object; - int start; - int end; + Py_ssize_t start; + Py_ssize_t end; PyObject *res; Py_UNICODE *p; Py_UNICODE *startp; @@ -708,7 +708,7 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc) *outp++ = hexdigits[c&0xf]; } - restuple = Py_BuildValue("(Oi)", res, end); + restuple = Py_BuildValue("(On)", res, end); Py_DECREF(res); Py_DECREF(object); return restuple; |