mirror of
https://github.com/python/cpython.git
synced 2025-07-29 06:05:00 +00:00
Fix more ssize_t issues.
This commit is contained in:
parent
26fd9607c7
commit
6685128b97
6 changed files with 13 additions and 13 deletions
|
@ -3034,7 +3034,7 @@ decode_unicode(const char *s, size_t len, int rawmode, const char *encoding)
|
|||
if (*s & 0x80) { /* XXX inefficient */
|
||||
PyObject *w;
|
||||
char *r;
|
||||
int rn, i;
|
||||
Py_ssize_t rn, i;
|
||||
w = decode_utf8(&s, end, "utf-16-be");
|
||||
if (w == NULL) {
|
||||
Py_DECREF(u);
|
||||
|
|
|
@ -1560,7 +1560,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
|
|||
/* XXX move into writeobject() ? */
|
||||
if (PyString_Check(v)) {
|
||||
char *s = PyString_AS_STRING(v);
|
||||
int len = PyString_GET_SIZE(v);
|
||||
Py_ssize_t len = PyString_GET_SIZE(v);
|
||||
if (len == 0 ||
|
||||
!isspace(Py_CHARMASK(s[len-1])) ||
|
||||
s[len-1] == ' ')
|
||||
|
@ -1569,7 +1569,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
|
|||
#ifdef Py_USING_UNICODE
|
||||
else if (PyUnicode_Check(v)) {
|
||||
Py_UNICODE *s = PyUnicode_AS_UNICODE(v);
|
||||
int len = PyUnicode_GET_SIZE(v);
|
||||
Py_ssize_t len = PyUnicode_GET_SIZE(v);
|
||||
if (len == 0 ||
|
||||
!Py_UNICODE_ISSPACE(s[len-1]) ||
|
||||
s[len-1] == ' ')
|
||||
|
|
|
@ -95,7 +95,7 @@ PyObject *_PyCodec_Lookup(const char *encoding)
|
|||
{
|
||||
PyInterpreterState *interp;
|
||||
PyObject *result, *args = NULL, *v;
|
||||
int i, len;
|
||||
Py_ssize_t i, len;
|
||||
|
||||
if (encoding == NULL) {
|
||||
PyErr_BadArgument();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue